Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
b6cd4a9e24
39 changed files with 114 additions and 167 deletions
|
|
@ -31,6 +31,7 @@ let
|
|||
|
||||
# Mime.types values are taken from brotli sample configuration - https://github.com/google/ngx_brotli
|
||||
# and Nginx Server Configs - https://github.com/h5bp/server-configs-nginx
|
||||
# "text/html" is implicitly included in {brotli,gzip,zstd}_types
|
||||
compressMimeTypes = [
|
||||
"application/atom+xml"
|
||||
"application/geo+json"
|
||||
|
|
@ -55,7 +56,6 @@ let
|
|||
"text/calendar"
|
||||
"text/css"
|
||||
"text/csv"
|
||||
"text/html"
|
||||
"text/javascript"
|
||||
"text/markdown"
|
||||
"text/plain"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation {
|
||||
pname = "dfilemanager";
|
||||
version = "unstable-2020-09-04";
|
||||
version = "unstable-2021-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "probonopd";
|
||||
repo = "dfilemanager";
|
||||
rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48";
|
||||
sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY=";
|
||||
rev = "61179500a92575e05cf9a71d401c388726bfd73d";
|
||||
sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, nix-update-script }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exercism";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exercism";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo";
|
||||
owner = "exercism";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9GdkQaxYvxMGI5aFwUtQnctjpZfjZaKP3CsMjC/ZBSo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw";
|
||||
vendorHash = "sha256-EW9SNUqJHgPQlNpeErYaooJRXGcDrNpXLhMYpmZPVSw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "./exercism" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "A Go based command line tool for exercism.io";
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fnott";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fnott";
|
||||
rev = version;
|
||||
sha256 = "sha256-6NMMU39v8+Ir3rf7kVwBdEOuYnZC1MqtZnim8+0A7wM=";
|
||||
sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/dnkl/fnott";
|
||||
description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors.";
|
||||
license = licenses.mit;
|
||||
description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors";
|
||||
license = with licenses; [ mit zlib ];
|
||||
maintainers = with maintainers; [ polykernel ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,22 +10,30 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mozphab";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
version = "1.4.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-conduit";
|
||||
repo = "review";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4=";
|
||||
hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "glean-sdk>=50.0.1,==50.*" "glean-sdk"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
colorama
|
||||
distro
|
||||
glean-sdk
|
||||
packaging
|
||||
|
|
|
|||
|
|
@ -90,11 +90,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.49.128";
|
||||
version = "1.50.114";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-TXAPzhNRupv8R2rKj/mFdubAVjOrnmbdBtmasTnqfyU=";
|
||||
sha256 = "sha256-aZuNxO4whVRUb4Up0VwyMiI50OumWuCDfzm15ywGdIk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goeland";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slurdge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s=";
|
||||
sha256 = "sha256-O4/dKTphgvcL5V66pMk2blXZ1cVsUgazMBaZCoAAwkY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY=";
|
||||
vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.4";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
sha256 = "sha256-aF1f6EmlcUgZOkHJgrW6P923QW56vWMH8CZ4cnYiiSk=";
|
||||
sha256 = "sha256-tFerQJhe/FemtOaP56b2XhLtXH2a8CRT2E69v/77Qz0=";
|
||||
};
|
||||
|
||||
postPath = ''
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smartgithg";
|
||||
version = "22.1.4";
|
||||
version = "22.1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
|
||||
sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk=";
|
||||
sha256 = "sha256-s31sYEC1g7eLMhT9UkmjbBnHePY9wnQPmgGQXgVX4j4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2022-11-15";
|
||||
version = "2023-04-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "Rx22O8C7kbYADxqJF8u6kdcQnXNA5aS+NWOnx/X4urY=";
|
||||
sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,9 +29,11 @@ stdenv.mkDerivation rec {
|
|||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildInputs = [ jre ant jdk jre ];
|
||||
buildInputs = [ jre ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
# note for the future:
|
||||
# if you use makeBinaryWrapper, you will trade bash for glibc, the closure will be slightly larger
|
||||
nativeBuildInputs = [ makeWrapper ant jdk ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update curl
|
||||
#!nix-shell -i bash -p nix-update subversion
|
||||
|
||||
new_version=$(curl https://armedbear.common-lisp.dev/ | grep abcl-src | sed 's;[^>]*>abcl-src-\(.*\).tar[^$]*;\1;' | head -n 1)
|
||||
new_version=$(svn ls https://abcl.org/svn/tags | tail -1 | tr -d /)
|
||||
nix-update abcl --version "$new_version"
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ in with passthru; stdenv.mkDerivation {
|
|||
ncurses6
|
||||
sqlite
|
||||
zlib
|
||||
stdenv.cc.cc.libgcc or null
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
tcl-8_5
|
||||
tk-8_5
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ in with passthru; stdenv.mkDerivation {
|
|||
ncurses6
|
||||
sqlite
|
||||
zlib
|
||||
stdenv.cc.cc.libgcc or null
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
tcl-8_5
|
||||
tk-8_5
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irrlichtmt";
|
||||
version = "1.9.0mt8";
|
||||
version = "1.9.0mt10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "irrlicht";
|
||||
rev = version;
|
||||
sha256 = "sha256-bwpALhBk16KugYqKuN57M3t5Ba7rdyrYWn/iBoi8hpg=";
|
||||
sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,25 +22,25 @@ let
|
|||
|
||||
# determine the version number, there might be different ones per architecture
|
||||
version = {
|
||||
x86_64-linux = "19.16.0.0.0";
|
||||
x86_64-linux = "21.9.0.0.0";
|
||||
aarch64-linux = "19.10.0.0.0";
|
||||
x86_64-darwin = "19.3.0.0.0";
|
||||
x86_64-darwin = "19.8.0.0.0";
|
||||
}.${stdenv.hostPlatform.system} or throwSystem;
|
||||
|
||||
directory = {
|
||||
x86_64-linux = "1916000";
|
||||
x86_64-linux = "219000";
|
||||
aarch64-linux = "191000";
|
||||
x86_64-darwin = "193000";
|
||||
x86_64-darwin = "198000";
|
||||
}.${stdenv.hostPlatform.system} or throwSystem;
|
||||
|
||||
# hashes per component and architecture
|
||||
hashes = {
|
||||
x86_64-linux = {
|
||||
basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ=";
|
||||
sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI=";
|
||||
sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw=";
|
||||
tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE=";
|
||||
odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA=";
|
||||
basic = "sha256-wiygUvZFYvjp5pndv3b9yTPxe8sC5HZkJ7jZqO1Mss8=";
|
||||
sdk = "sha256-ehqHV52yLRe8ehrKqpLaN0HnN3zjHU7WrfjtqvQadgY=";
|
||||
sqlplus = "sha256-tYvoG+7l5jXyTpxFUYZXaHCT0xGDeah78AinJ2qIsE8=";
|
||||
tools = "sha256-6K2Ni0ZqqpqCrGFrBD06s0QNjNEDtNPrvDQ1U97lTKY=";
|
||||
odbc = "sha256-yTANMLhaEqm9/ZEVqhEn1Gl8eJukgvqpqdaMRjxWxgs=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY=";
|
||||
|
|
@ -50,11 +50,11 @@ let
|
|||
odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd";
|
||||
sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27";
|
||||
sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e";
|
||||
tools = "b2bc474f98da13efdbc77fd05f559498cd8c08582c5b9038f6a862215de33f2c";
|
||||
odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725";
|
||||
basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc=";
|
||||
sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw=";
|
||||
sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk=";
|
||||
tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU=";
|
||||
odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or throwSystem;
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ stdenv.mkDerivation {
|
|||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
maintainers = with maintainers; [ flokli dylanmtaylor ];
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "hpack";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
|
||||
sha256 = "sha256-7gjRhJs2mufQbImAXiKFT9mZ1kHGSHHwjCVZM5f0C14=";
|
||||
hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, buildDunePackage
|
||||
, h2
|
||||
, httpaf
|
||||
|
|
@ -17,24 +16,16 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "http-mirage-client";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
|
||||
hash = "sha256-stom13t3Kn1ehkeURem39mxhd3Lmlz8z9m3tHGcp5vY=";
|
||||
hash = "sha256-6PMxZQfPiDTFbj9gOO2tW5FHF0MUP5tOySjkYg+QwGA=";
|
||||
};
|
||||
|
||||
# Make tests use mirage-crypto
|
||||
patches = lib.lists.map fetchpatch [
|
||||
{ url = "https://github.com/roburio/http-mirage-client/commit/c6cd38db9c23ac23e7c3e4cf2d41420f58034e8d.patch";
|
||||
hash = "sha256-b3rurqF0DxLpVQEhVfROwc7qyul0Fjfl3zhD8AkzemU="; }
|
||||
{ url = "https://github.com/roburio/http-mirage-client/commit/0a5367e7c6d9b7f45c88493f7a596f7a83e8c7d5.patch";
|
||||
hash = "sha256-Q6YlfuiAfsyhty9EvoBetvekuU25KjrH5wwGwYTAAiA="; }
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h2
|
||||
httpaf
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
|
||||
, angstrom, faraday, alcotest
|
||||
}:
|
||||
|
||||
|
|
@ -6,7 +6,8 @@ buildDunePackage rec {
|
|||
pname = "httpaf";
|
||||
version = "0.7.1";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inhabitedtype";
|
||||
|
|
@ -17,7 +18,7 @@ buildDunePackage rec {
|
|||
|
||||
checkInputs = [ alcotest ];
|
||||
propagatedBuildInputs = [ angstrom faraday ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "A high-performance, memory-efficient, and scalable web server for OCaml";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ buildDunePackage {
|
|||
inherit (paf)
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
|
||||
duneVersion = "3";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ buildDunePackage
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, mirage-stack
|
||||
, mirage-time
|
||||
, h2
|
||||
|
|
@ -25,21 +24,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "paf";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
|
||||
hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE=";
|
||||
hash = "sha256-oWRvwb8DhtF3ltWaZ6moKmgadFUngruo1UOIaGNV/oM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Compatibility with mirage-crypto 0.11.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dinosaure/paf-le-chien/commit/2f308c1c4d3ff49d42136f8ff86a4385661e4d1b.patch";
|
||||
hash = "sha256-jmSeUpoRoUMPUNEH3Av2LxgRZs+eAectK+CpoH+SdpY=";
|
||||
})
|
||||
];
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, paf
|
||||
, dns-client-mirage
|
||||
, duration
|
||||
, emile
|
||||
, httpaf
|
||||
, letsencrypt
|
||||
, mirage-stack
|
||||
, mirage-time
|
||||
, tls-mirage
|
||||
, x509
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "paf-le";
|
||||
|
||||
inherit (paf)
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paf
|
||||
dns-client-mirage
|
||||
duration
|
||||
emile
|
||||
httpaf
|
||||
letsencrypt
|
||||
mirage-stack
|
||||
mirage-time
|
||||
tls-mirage
|
||||
x509
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = paf.meta // {
|
||||
description = "A CoHTTP client with its HTTP/AF implementation";
|
||||
};
|
||||
}
|
||||
|
|
@ -23,24 +23,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-babel";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-babel";
|
||||
repo = "flask-babel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk=";
|
||||
hash = "sha256-KoTHBrGD6M3rkXoxUadRXhroRUbWKaL/rE6Rd2mxw4c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/python-babel/flask-babel/pull/222
|
||||
url = "https://github.com/python-babel/flask-babel/commit/756cace7d96e9eacef66813c8df653d2bb349da0.patch";
|
||||
hash = "sha256-hp/QPS/ZyRMUnyqU+fvMJKPISBECc9kqdCu8U6Hnd5g=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "immutabledict";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "corenting";
|
||||
repo = "immutabledict";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GeQ1BEBt+66YhohyaXt7rIVNpEk6mINwsC3JrmYNjRI=";
|
||||
hash = "sha256-cykTZw3p6P35rHaJmfmiXIqybc+ZeqUkxneoPot7E9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings";
|
||||
version = "0.20.0";
|
||||
version = "0.21.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "mkdocstrings";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eFHcwbYEIwVWvDJWlmeUvEdqp3NYAF8SgdHJGw6bEMc=";
|
||||
hash = "sha256-pi0BEe/zhG/V9wh2CO91Cc7Mze93+2tbVo6/2LGQ6Nw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.4.0";
|
||||
version = "23.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nMuf8k7o7cCpvk9IUp7lz6jM7rqCxHq4uT51R1w8jtM=";
|
||||
hash = "sha256-siaOZClcqivFZlscPiEo3skL6oVjDEWrabP8I+IvQJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "vallox-websocket-api";
|
||||
version = "3.1.0";
|
||||
version = "3.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "yozik04";
|
||||
repo = "vallox_websocket_api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JbTuBzRSgMTPSgWEEAJGc8R44VLHiMr4qocbBjpJBmk=";
|
||||
hash = "sha256-KtjyTSD7osIdThq/Ota4oCyeseBHxqaYaL47wiVicsI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.13.0";
|
||||
version = "2.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
hash = "sha256-0fgxDUCgjYzrWflsoCGe4WRy3C/NO7FmrSw/LJ/NiUE=";
|
||||
hash = "sha256-2bO6konOAyrCD+t31ZJ2+Ptp26ylY9wr1uArFu9rlnI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d5z6uuUOHUjARIiRTVJmdQ+9VBaercIcUrcgDsN1zCs=";
|
||||
vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4=";
|
||||
|
||||
postPatch = ''
|
||||
# Disable some tests that need file system & network access.
|
||||
|
|
|
|||
|
|
@ -128,9 +128,9 @@ let
|
|||
};
|
||||
|
||||
v5 = {
|
||||
version = "5.6.1";
|
||||
sha256 = "sha256-1mUmtM09jqJhD2RcLCAjaI+JkqP52QYH3KLkY5MZ860=";
|
||||
dataSha256 = "sha256-Ye8MihrOqjSoy+vNr/CM/C/sNXdexe08dxrmoMxsG/A=";
|
||||
version = "5.7.0";
|
||||
sha256 = "sha256-9AL6gTmy05yTeYfCq3EMK4gqpBWdHwvJ5Flpzj8hFAE=";
|
||||
dataSha256 = "sha256-wWgeO8513N5jQdWvZrq357fPpAU5ik06mgZraWCQawo=";
|
||||
};
|
||||
|
||||
mkClient = version: generic (version // { buildClient = true; buildServer = false; });
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpuid";
|
||||
version = "20230228";
|
||||
version = "20230406";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-EYLFnFqpp7ljNzlABgQ+YN7hQIh6DBeERm1dLAhH7fM=";
|
||||
sha256 = "sha256-9ARd5TXzDjTowBKwVM5m9ArDmRRNbjw4lr2AwN7u8bA=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "1.8.13";
|
||||
version = "1.8.14";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
|
@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-UBKFC/hq4kkrjkuHTqIimbR332Vk/X4VQeYROGeAVi8=";
|
||||
hash = "sha256-xq9J44yhnF3bTutlkOLIMFM96XHMmoCL8i37tSxgPp0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles }:
|
||||
{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles, nix-update-script }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustic-rs";
|
||||
|
|
@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "rustic-rs";
|
||||
repo = "rustic";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r4hOjX/LKv2wX720FMEztUo9rf2hDBLfcHtENSZNA3U=";
|
||||
};
|
||||
|
||||
|
|
@ -28,6 +28,8 @@ rustPlatform.buildRustPackage rec {
|
|||
installShellCompletion rustic.{ba,fi}sh
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rustic-rs/rustic";
|
||||
changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pistol";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doronbehar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DGbWlEDI/qGNpdT8N79RsLxnUm4Sw8lHFRIBFd1GmK0=";
|
||||
sha256 = "sha256-6V3Du3+0YliwzsvZolapBAnyqbsv1WZhWQkaldDR+Ok=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-poTd0lXRaJeDxwcw+h76NPC0mFB9nwm2vLLB5UUK1dk=";
|
||||
vendorSha256 = "sha256-jURN0NSc9SFHFMS8QdaEqqBwOHnAEEJQlQXHTUDRiyE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ buildGoModule rec {
|
|||
installShellFiles
|
||||
asciidoctor
|
||||
];
|
||||
postBuild = ''
|
||||
postInstall = ''
|
||||
asciidoctor -b manpage -d manpage README.adoc
|
||||
installManPage pistol.1
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "pre-commit";
|
||||
version = "3.1.0";
|
||||
version = "3.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonApplication rec {
|
|||
owner = "pre-commit";
|
||||
repo = "pre-commit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-riAXvpJmuQHOfruwebijiAgN2AvqpUUI07p758qO+4k=";
|
||||
hash = "sha256-WRQdxFlTpLmQpX9x3swlkSr2iv0alSiCRtTjhQC164c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ gcc9Stdenv, lib, fetchFromGitLab, autoreconfHook, libpcap, db, glib, libnet, libnids, symlinkJoin, openssl
|
||||
, rpcsvc-proto, libtirpc, libnsl
|
||||
, rpcsvc-proto, libtirpc, libnsl, libnl
|
||||
}:
|
||||
|
||||
# We compile with GCC 9 since GCC 10 segfaults on the code
|
||||
|
|
@ -59,8 +59,8 @@ in gcc9Stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook rpcsvc-proto ];
|
||||
buildInputs = [ glib pcap libtirpc libnsl ];
|
||||
NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc";
|
||||
buildInputs = [ glib pcap libtirpc libnsl libnl ];
|
||||
NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread -ltirpc -lnl-3 -lnl-genl-3";
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
postPatch = ''
|
||||
for patch in debian/patches/*.patch; do
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ buildGoModule rec {
|
|||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/xray \
|
||||
--suffix XRAY_LOCATION_ASSET : $assetsDrv/share/v2ray
|
||||
--suffix V2RAY_LOCATION_ASSET : $assetsDrv/share/v2ray
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-04-07";
|
||||
version = "2023-04-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PcrnqlbhoE9clYCsGX6ttMr92a+2BhuDP8aT6wG9aN0=";
|
||||
hash = "sha256-dleCqYSfmp0XU1UbX/HSq7EbwTcUcr6PbsTEri72Hoo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -29497,6 +29497,8 @@ with pkgs;
|
|||
|
||||
dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
|
||||
|
||||
dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { };
|
||||
|
||||
dht = callPackage ../applications/networking/p2p/dht { };
|
||||
|
||||
dia = callPackage ../applications/graphics/dia { };
|
||||
|
|
|
|||
|
|
@ -1259,8 +1259,6 @@ let
|
|||
|
||||
paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { };
|
||||
|
||||
paf-le = callPackage ../development/ocaml-modules/paf/le.nix { };
|
||||
|
||||
parany = callPackage ../development/ocaml-modules/parany { };
|
||||
|
||||
parmap = callPackage ../development/ocaml-modules/parmap { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue