Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6caa6affcc
@ -8,6 +8,8 @@ in
|
||||
services.asusd = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "the asusd service for ASUS ROG laptops");
|
||||
|
||||
package = lib.mkPackageOption pkgs "asusctl" { };
|
||||
|
||||
enableUserService = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
@ -73,7 +75,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.asusctl ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc =
|
||||
let
|
||||
@ -92,9 +94,9 @@ in
|
||||
};
|
||||
|
||||
services.dbus.enable = true;
|
||||
systemd.packages = [ pkgs.asusctl ];
|
||||
services.dbus.packages = [ pkgs.asusctl ];
|
||||
services.udev.packages = [ pkgs.asusctl ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
services.supergfxd.enable = lib.mkDefault true;
|
||||
|
||||
systemd.user.services.asusd-user.enable = cfg.enableUserService;
|
||||
|
||||
@ -81,6 +81,13 @@ in
|
||||
extraStructuredConfig.FOO = lib.kernel.yes;
|
||||
features.foo = true;
|
||||
}
|
||||
{
|
||||
name = "foo-ml-mbox";
|
||||
patch = (fetchurl {
|
||||
url = "https://lore.kernel.org/lkml/19700205182810.58382-1-email@domain/t.mbox.gz";
|
||||
hash = "sha256-...";
|
||||
});
|
||||
}
|
||||
]
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "5.0.11";
|
||||
version = "5.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-c9bRWVWCC9hLxmko6EHgxgmghrxskJP4PQf3ld2BHoY=";
|
||||
sha256 = "sha256-1/iKezOD2HCym6JBXRa9rGpjolJjrxRZA4vwfgZyVng=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.5.1";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-oVrm1mK2yw5IF7WZCwDQ1U/JdYvUPKJY/kzRSp6Pzwo=";
|
||||
hash = "sha256-ic5OHGxU/crq6IqqUnzAC+99KpCXUKFagnAKD4FtYBI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-QDpCGfykTUIgPQxHH8qIfmOsQrcQfZ3/vwjsuvUo1Fo=";
|
||||
vendorHash = "sha256-zuATJ5FBdil9bHgkMf32WuTW6/99GIsGCzI5srP21m8=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
||||
@ -65,10 +65,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pce-fast-libretro",
|
||||
"rev": "86a80e1ba551f9a4627b8394901db0ee365c1442",
|
||||
"hash": "sha256-aIDc4jzliVLpI2Xetcd5tG74/xvIlqRdVEb72yHrsCo="
|
||||
"rev": "d97d9558fe218ea04821788cee1f2c03556e818a",
|
||||
"hash": "sha256-RKKx7Vf5d+VBYe0HVMsSchRtga7LbLiLchM4a80Lfns="
|
||||
},
|
||||
"version": "unstable-2024-02-09"
|
||||
"version": "unstable-2024-02-16"
|
||||
},
|
||||
"beetle-pcfx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -276,10 +276,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "dacb63782bda34d6ac3cb8dd0e071695b8092483",
|
||||
"hash": "sha256-Jnp9QmXAz/q31baJ5jCi0ZH/B2a4ErtDe+e2P1iYLeU="
|
||||
"rev": "2adfb2723b5d7abcf33633fd30a794dce4263a5b",
|
||||
"hash": "sha256-AZzMGbCZJZ/BJ7A9CybwRPxfi7P7TBU7nRPzn/6kwrc="
|
||||
},
|
||||
"version": "unstable-2024-02-14"
|
||||
"version": "unstable-2024-02-16"
|
||||
},
|
||||
"fceumm": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -347,10 +347,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "Genesis-Plus-GX",
|
||||
"rev": "ecb956d914d6bc4e5deb49384bc929939e9a19e5",
|
||||
"hash": "sha256-Fk+Ldjav+yQl6fkYESR6t1JEOKiCZYCW386QL4ozE68="
|
||||
"rev": "7aba063778534a78b080a737c0465667ebd66154",
|
||||
"hash": "sha256-Rx5ymDqYmtovr/IJRY4loUwwWTk8GEs+oviP4YOk6ZI="
|
||||
},
|
||||
"version": "unstable-2024-02-06"
|
||||
"version": "unstable-2024-02-16"
|
||||
},
|
||||
"gpsp": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -427,10 +427,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "a4d62997d332acc709c9644641863c5498e01eb0",
|
||||
"hash": "sha256-9+pxx/fhNsvAMYDqalkkdljaR8/XxuMMSrrz7KeJtDU="
|
||||
"rev": "fc987f1913203a41bca7f6fd16e92c83729dd7fc",
|
||||
"hash": "sha256-Mn0WuzGGxDlUEccC21V0FzRyTAgRoAnLCm5jpz9rkdY="
|
||||
},
|
||||
"version": "unstable-2024-02-13"
|
||||
"version": "unstable-2024-02-16"
|
||||
},
|
||||
"mame2010": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -619,10 +619,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx_rearmed",
|
||||
"rev": "016c6e93f6db684211f5c8b05433cb500715ba50",
|
||||
"hash": "sha256-uYzL0uuQbxa4N0uQT8YEBiCgwkIcigvjeNU600WqSDQ="
|
||||
"rev": "9aefd427e47e1cdf94578e1913054bc14a44bab6",
|
||||
"hash": "sha256-CWeHKajdTu4M8SioMsIt6c1BrnguPxmQ6cKOkPpRdqw="
|
||||
},
|
||||
"version": "unstable-2024-02-07"
|
||||
"version": "unstable-2024-02-14"
|
||||
},
|
||||
"picodrive": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -640,8 +640,8 @@
|
||||
"src": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "691a893400ef3ca515cb39c7552a8f04bb2d55fa",
|
||||
"hash": "sha256-42d++0R+LcFuFT9T1+9/0eot+IdBDbqoA/axeHTWZfk=",
|
||||
"rev": "2462fe76ebf86fe1dd4da8d79b99872f14e987bf",
|
||||
"hash": "sha256-08srcJwhvOw6AER36+ar2SXjKR1jO568lRl63B7zRio=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-02-14"
|
||||
@ -651,11 +651,11 @@
|
||||
"src": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "d832f96010fa378ef0a7f7980524a61803110ad7",
|
||||
"hash": "sha256-LkngiwjRoYw+N+DCdbbWnTokDAYXbqOMJX+DQGAUl2g=",
|
||||
"rev": "f5450e40eb3f4861451fb98bf9239dacc5aef81e",
|
||||
"hash": "sha256-Kj0bxp2ValsmoKHP4x8LJ60priLnRAvgtjsUemm0do4=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-02-13"
|
||||
"version": "unstable-2024-02-16"
|
||||
},
|
||||
"prboom": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exercism";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exercism";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+DXmbbs9oo667o5P0OVcfBMMIvyBzEAdbrq9i+U7p0k=";
|
||||
hash = "sha256-Mtb5c1/k8kp7bETOSE0X969BV176jpoprr1/mQ3E4Vg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wQGnGshsRJLe3niHDoyr3BTxbwrV3L66EjJ8x633uHY=";
|
||||
vendorHash = "sha256-fnsSvbuVGRAndU88su2Ck7mV8QBDhxozdmwI3XGtxcA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -24,12 +24,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phoc";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchurl {
|
||||
# This tarball includes the meson wrapped subproject 'gmobile'.
|
||||
url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-q2wyM0R7Mi/XuckNb6ZDkStaV9yJH1BgJ4cjqQc6EI4=";
|
||||
hash = "sha256-eAKHboICsuQ4lecxnnZ8+hZjt5l1DDQbfuwypDYtdKk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
45
pkgs/build-support/fetchpypilegacy/default.nix
Normal file
45
pkgs/build-support/fetchpypilegacy/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
# Fetch from PyPi legacy API as documented in https://warehouse.pypa.io/api-reference/legacy.html
|
||||
{ runCommand
|
||||
, lib
|
||||
, python3
|
||||
}:
|
||||
{
|
||||
# package name
|
||||
pname,
|
||||
# Package index
|
||||
url ? null,
|
||||
# Multiple package indices to consider
|
||||
urls ? [ ],
|
||||
# filename including extension
|
||||
file,
|
||||
# SRI hash
|
||||
hash,
|
||||
# allow overriding the derivation name
|
||||
name ? null,
|
||||
}:
|
||||
let
|
||||
urls' = urls ++ lib.optional (url != null) url;
|
||||
|
||||
pathParts = lib.filter ({ prefix, path }: "NETRC" == prefix) builtins.nixPath;
|
||||
netrc_file =
|
||||
if (pathParts != [ ])
|
||||
then (lib.head pathParts).path
|
||||
else "";
|
||||
|
||||
in
|
||||
# Assert that we have at least one URL
|
||||
assert urls' != [ ]; runCommand file
|
||||
({
|
||||
nativeBuildInputs = [ python3 ];
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
outputHashMode = "flat";
|
||||
# if hash is empty select a default algo to let nix propose the actual hash.
|
||||
outputHashAlgo = if hash == "" then "sha256" else null;
|
||||
outputHash = hash;
|
||||
NETRC = netrc_file;
|
||||
}
|
||||
// (lib.optionalAttrs (name != null) {inherit name;}))
|
||||
''
|
||||
python ${./fetch-legacy.py} ${lib.concatStringsSep " " (map (url: "--url ${lib.escapeShellArg url}") urls')} --pname ${pname} --filename ${file}
|
||||
mv ${file} $out
|
||||
''
|
||||
162
pkgs/build-support/fetchpypilegacy/fetch-legacy.py
Normal file
162
pkgs/build-support/fetchpypilegacy/fetch-legacy.py
Normal file
@ -0,0 +1,162 @@
|
||||
# Some repositories (such as Devpi) expose the Pypi legacy API
|
||||
# (https://warehouse.pypa.io/api-reference/legacy.html).
|
||||
#
|
||||
# Note it is not possible to use pip
|
||||
# https://discuss.python.org/t/pip-download-just-the-source-packages-no-building-no-metadata-etc/4651/12
|
||||
|
||||
import base64
|
||||
import argparse
|
||||
import netrc
|
||||
import os
|
||||
import shutil
|
||||
import ssl
|
||||
import sys
|
||||
import urllib.request
|
||||
from html.parser import HTMLParser
|
||||
from os.path import normpath
|
||||
from typing import Optional
|
||||
from urllib.parse import urlparse, urlunparse
|
||||
|
||||
|
||||
# Parse the legacy index page to extract the href and package names
|
||||
class Pep503(HTMLParser):
|
||||
def __init__(self) -> None:
|
||||
super().__init__()
|
||||
self.sources: dict[str, str] = {}
|
||||
self.url: Optional[str] = None
|
||||
self.name: Optional[str] = None
|
||||
|
||||
def handle_data(self, data: str) -> None:
|
||||
if self.url is not None:
|
||||
self.name = data
|
||||
|
||||
def handle_starttag(self, tag: str, attrs: list[tuple[str, Optional[str]]]) -> None:
|
||||
if tag == "a":
|
||||
for name, value in attrs:
|
||||
if name == "href":
|
||||
self.url = value
|
||||
|
||||
def handle_endtag(self, tag: str) -> None:
|
||||
if self.url is not None:
|
||||
if not self.name:
|
||||
raise ValueError("Name not set")
|
||||
|
||||
self.sources[self.name] = self.url
|
||||
self.url = None
|
||||
|
||||
|
||||
def try_fetch(url: str, package_name: str, package_filename: str) -> None:
|
||||
index_url = url + "/" + package_name + "/"
|
||||
|
||||
# Parse username and password for this host from the netrc file if given.
|
||||
username: Optional[str] = None
|
||||
password: Optional[str] = None
|
||||
if os.environ.get("NETRC", "") != "":
|
||||
netrc_obj = netrc.netrc(os.environ["NETRC"])
|
||||
host = urlparse(index_url).netloc
|
||||
# Strip port number if present
|
||||
if ":" in host:
|
||||
host = host.split(":")[0]
|
||||
authenticators = netrc_obj.authenticators(host)
|
||||
if authenticators:
|
||||
username, _, password = authenticators
|
||||
|
||||
print("Reading index %s" % index_url)
|
||||
|
||||
context = ssl.create_default_context()
|
||||
|
||||
# Extract out username/password from index_url, if present.
|
||||
parsed_url = urlparse(index_url)
|
||||
username = parsed_url.username or username
|
||||
password = parsed_url.password or password
|
||||
index_url = parsed_url._replace(netloc=parsed_url.netloc.rpartition("@")[-1]).geturl()
|
||||
|
||||
req = urllib.request.Request(index_url)
|
||||
|
||||
if username and password: # Add authentication
|
||||
password_b64 = base64.b64encode(":".join((username, password)).encode()).decode("utf-8")
|
||||
req.add_header("Authorization", "Basic {}".format(password_b64))
|
||||
else: # If we are not using authentication disable TLS verification for long term reproducibility
|
||||
context.check_hostname = False
|
||||
context.verify_mode = ssl.CERT_NONE
|
||||
|
||||
response = urllib.request.urlopen(req, context=context)
|
||||
index = response.read()
|
||||
|
||||
parser = Pep503()
|
||||
parser.feed(str(index, "utf-8"))
|
||||
if package_filename not in parser.sources:
|
||||
print("The file %s has not be found in the index %s" % (package_filename, index_url))
|
||||
exit(1)
|
||||
|
||||
package_file = open(package_filename, "wb")
|
||||
# Sometimes the href is a relative or absolute path within the index's domain.
|
||||
indicated_url = urlparse(parser.sources[package_filename])
|
||||
if indicated_url.netloc == "":
|
||||
parsed_url = urlparse(index_url)
|
||||
|
||||
if indicated_url.path.startswith("/"):
|
||||
# An absolute path within the index's domain.
|
||||
path = parser.sources[package_filename]
|
||||
else:
|
||||
# A relative path.
|
||||
path = parsed_url.path + "/" + parser.sources[package_filename]
|
||||
|
||||
package_url = urlunparse(
|
||||
(
|
||||
parsed_url.scheme,
|
||||
parsed_url.netloc,
|
||||
path,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
)
|
||||
)
|
||||
else:
|
||||
package_url = parser.sources[package_filename]
|
||||
|
||||
# Handle urls containing "../"
|
||||
parsed_url = urlparse(package_url)
|
||||
real_package_url = urlunparse(
|
||||
(
|
||||
parsed_url.scheme,
|
||||
parsed_url.netloc,
|
||||
normpath(parsed_url.path),
|
||||
parsed_url.params,
|
||||
parsed_url.query,
|
||||
parsed_url.fragment,
|
||||
)
|
||||
)
|
||||
print("Downloading %s" % real_package_url)
|
||||
|
||||
req = urllib.request.Request(real_package_url)
|
||||
if username and password:
|
||||
req.add_unredirected_header("Authorization", "Basic {}".format(password_b64))
|
||||
response = urllib.request.urlopen(req, context=context)
|
||||
|
||||
with response as r:
|
||||
shutil.copyfileobj(r, package_file)
|
||||
|
||||
|
||||
argparser = argparse.ArgumentParser(description="Fetch file from legacy pypi API")
|
||||
argparser.add_argument("--url", action="append", required=True)
|
||||
argparser.add_argument("--pname", action="store", required=True)
|
||||
argparser.add_argument("--filename", action="store", required=True)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
args = argparser.parse_args()
|
||||
for url in args.url:
|
||||
try:
|
||||
try_fetch(url, args.pname, args.filename)
|
||||
except urllib.error.HTTPError as e:
|
||||
print("Got exception'", e, "', trying next package index", file=sys.stderr)
|
||||
continue
|
||||
else:
|
||||
break
|
||||
else:
|
||||
print(
|
||||
f"Could not fetch package '{args.pname}' file '{args.filename}' from any mirrors: {args.url}",
|
||||
file=sys.stderr,
|
||||
)
|
||||
exit(1)
|
||||
9
pkgs/build-support/fetchpypilegacy/tests.nix
Normal file
9
pkgs/build-support/fetchpypilegacy/tests.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ testers, fetchPypiLegacy, ... }: {
|
||||
# Tests that we can send custom headers with spaces in them
|
||||
fetchSimple = testers.invalidateFetcherByDrvHash fetchPypiLegacy {
|
||||
pname = "requests";
|
||||
file = "requests-2.31.0.tar.gz";
|
||||
url = "https://pypi.org/simple";
|
||||
hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE=";
|
||||
};
|
||||
}
|
||||
35
pkgs/by-name/cu/cursewords/package.nix
Normal file
35
pkgs/by-name/cu/cursewords/package.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "cursewords";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thisisparker";
|
||||
repo = "cursewords";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ssr15kSdWmyMFFG5uCregrpGQ3rI2cMXqY9+/a3gs84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.setuptools
|
||||
python3Packages.wheel
|
||||
];
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.blessed
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thisisparker/cursewords";
|
||||
description = "Graphical command line program for solving crossword puzzles in the terminal";
|
||||
mainProgram = "cursewords";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ danderson ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -31,13 +31,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2135";
|
||||
version = "2167";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-rYK5YaqzJXlAaSNXz37cDMhAr+OEGprfzTdtpd4/6jY=";
|
||||
hash = "sha256-b6q4yqhEO2UMmaUy06+3zDVXwwkYgRRb55PP57D7UVQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mountpoint-s3";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "mountpoint-s3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7anWK7vg6u7Sz4eV+X3QqeLj6y11iEmsi3iIlnEI79w=";
|
||||
hash = "sha256-V9d3rAb1rbso69RUMgwZdqfchgcDUlFU2LFjCk59uew=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qqPzf56KqVsmey353GpeJ6xdVLnGfjh/KlErWKkB6JU=";
|
||||
cargoHash = "sha256-9cdz1G4mKyg4TfsL+laoB6+6rqEgk8A3VkTjejETAKo=";
|
||||
|
||||
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
|
||||
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3
|
||||
|
||||
40
pkgs/by-name/mo/movim/package.nix
Normal file
40
pkgs/by-name/mo/movim/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, php
|
||||
, withPgsql ? true # “strongly recommended” according to docs
|
||||
, withMysql ? false
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "movim";
|
||||
version = "0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "movim";
|
||||
repo = "movim";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9MBe2IRYxvUuCc5m7ajvIlBU7YVm4A3RABlOOIjpKoM=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
extensions = ({ all, enabled }:
|
||||
enabled
|
||||
++ (with all; [ curl dom gd imagick mbstring ])
|
||||
++ lib.optional withPgsql all.pgsql
|
||||
++ lib.optional withMysql all.mysqli
|
||||
);
|
||||
};
|
||||
|
||||
# no listed license
|
||||
# pinned commonmark
|
||||
composerStrictValidation = false;
|
||||
|
||||
vendorHash = "sha256-PBoJbVuF0Qy7nNlL4yx446ivlZpPYNIai78yC0wWkCM=";
|
||||
|
||||
meta = {
|
||||
description = "a federated blogging & chat platform that acts as a web front end for the XMPP protocol";
|
||||
homepage = "https://movim.eu";
|
||||
license = lib.licenses.agpl3;
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
};
|
||||
})
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mystmd";
|
||||
version = "1.1.40";
|
||||
version = "1.1.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "mystmd";
|
||||
rev = "mystmd@${version}";
|
||||
hash = "sha256-RN3jrcTLdVnG4QF3OCg12S5faaYqkEhWGW7BaZKli4M=";
|
||||
hash = "sha256-oVdZ2U1h1BFjo82IDFFHlQHR/V/GNLx4qWtSLhWm3ck=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-VZO5VXwmBpTdUdlBPgRz2P9Q7xDc1GaBrHEGnvYXx/E=";
|
||||
npmDepsHash = "sha256-ucw9ayyIocF/AKkXrzvBDaQ5Mv2edQdiYbX+G3bcHrs=";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
|
||||
29
pkgs/by-name/re/restinio_0_6/package.nix
Normal file
29
pkgs/by-name/re/restinio_0_6/package.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "restinio";
|
||||
version = "0.6.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/include
|
||||
mv restinio-*/dev/restinio $out/include
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library";
|
||||
homepage = "https://github.com/Stiffstream/restinio";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uxn";
|
||||
version = "unstable-2024-02-07";
|
||||
version = "unstable-2024-02-14";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "300a3d7b3ed399721cef59e9ed9efe8a1d4e0f6f";
|
||||
hash = "sha256-uwHXa4GhXNJHroQG8t3VQggvdCA3G4/1d/XVfsgeI7E=";
|
||||
rev = "8abb621b12df11f7975ad1485d556ebb8bcb2042";
|
||||
hash = "sha256-R36qrnNpR7cNosPnWxMr5/RMwA3ge/GvYPNCzcOziYk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "projects" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "actor-framework";
|
||||
version = "0.19.5";
|
||||
version = "0.19.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = version;
|
||||
hash = "sha256-G69qZ8aoaRP9Ug+BIhXrYs6xteUG3Zhxbo2O09LEh3s=";
|
||||
hash = "sha256-Nb/BF/+xDWV/6iPo3o/NO6EtIaAW+yGFj06AO2baFfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = "ngtcp2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/lHsHkSySKyZZdjTTYCo0a6cwcMcbOWNvAEcO36/kEw=";
|
||||
hash = "sha256-KKfr5AjaC56yUNdk928H1PyP79GnQJ2pIZcZQTgLhEQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -2158,7 +2158,7 @@
|
||||
"moduleExtensions": {
|
||||
"//:extensions.bzl%bazel_android_deps": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=",
|
||||
"bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -2177,9 +2177,9 @@
|
||||
},
|
||||
"//:extensions.bzl%bazel_build_deps": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=",
|
||||
"bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=",
|
||||
"accumulatedFileDigests": {
|
||||
"@@//src/test/tools/bzlmod:MODULE.bazel.lock": "10b96bd3c1eb194b0efe3a13fd06f2051abf36efb33414ad92048883ba471c7f",
|
||||
"@@//src/test/tools/bzlmod:MODULE.bazel.lock": "4e2a1386686aae6d7be071ef615438178fdb93104b5b84cf8a372b6a944b27cd",
|
||||
"@@//:MODULE.bazel": "63625ac7809ba5bc83e0814e16f223ac28a98df884897ddd5bfbd69fd4e3ddbf"
|
||||
},
|
||||
"envVariables": {},
|
||||
@ -2428,7 +2428,7 @@
|
||||
},
|
||||
"//:extensions.bzl%bazel_test_deps": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=",
|
||||
"bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -2478,7 +2478,7 @@
|
||||
},
|
||||
"//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "iz3RFYDcsjupaT10sdSPAhA44WL3eDYkTEnYThllj1w=",
|
||||
"bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -2505,7 +2505,7 @@
|
||||
},
|
||||
"//tools/test:extensions.bzl%remote_coverage_tools_extension": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "cizrA62cv8WUgb0cCmx5B6PRijtr/I4TAWxg/4caNGU=",
|
||||
"bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -43,15 +43,15 @@
|
||||
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
|
||||
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
|
||||
, enableNixHacks ? false
|
||||
, version ? "7.0.2",
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.0.0";
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
hash = "sha256-R35U9jdAAfQ5qUcbod6deCTa8SnblVEISezF4ZzogXA=";
|
||||
hash = "sha256-3qK5BXXUPvPkHEAvZMJIGETsvwtA+FSLdaIEpNUE4DU=";
|
||||
};
|
||||
|
||||
# Use builtins.fetchurl to avoid IFD, in particular on hydra
|
||||
|
||||
@ -937,12 +937,19 @@
|
||||
"name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"apple_support~1.5.0",
|
||||
"bazel_tools",
|
||||
"bazel_tools"
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
"@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "iz3RFYDcsjupaT10sdSPAhA44WL3eDYkTEnYThllj1w=",
|
||||
"bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -964,12 +971,13 @@
|
||||
"url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": []
|
||||
}
|
||||
},
|
||||
"@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "O9sf6ilKWU9Veed02jG9o2HM/xgV/UAyciuFBuxrFRY=",
|
||||
"bzlTransitiveDigest": "mcsWHq3xORJexV5/4eCvNOLxFOQKV6eli3fkr+tEaqE=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -987,7 +995,14 @@
|
||||
"name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"bazel_tools",
|
||||
"bazel_tools",
|
||||
"bazel_tools"
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
"@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": {
|
||||
@ -1005,7 +1020,8 @@
|
||||
"remote_xcode": ""
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": []
|
||||
}
|
||||
},
|
||||
"@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": {
|
||||
@ -1021,12 +1037,13 @@
|
||||
"name": "bazel_tools~sh_configure_extension~local_config_sh"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": []
|
||||
}
|
||||
},
|
||||
"@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "cizrA62cv8WUgb0cCmx5B6PRijtr/I4TAWxg/4caNGU=",
|
||||
"bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -1041,12 +1058,13 @@
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": []
|
||||
}
|
||||
},
|
||||
"@@rules_java~7.1.0//java:extensions.bzl%toolchains": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "iUIRqCK7tkhvcDJCAfPPqSd06IHG0a8HQD0xeQyVAqw=",
|
||||
"bzlTransitiveDigest": "D02GmifxnV/IhYgspsJMDZ/aE8HxAjXgek5gi6FSto4=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -1581,12 +1599,24 @@
|
||||
"build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"rules_java~7.1.0",
|
||||
"bazel_tools",
|
||||
"bazel_tools"
|
||||
],
|
||||
[
|
||||
"rules_java~7.1.0",
|
||||
"remote_java_tools",
|
||||
"rules_java~7.1.0~toolchains~remote_java_tools"
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
"@@rules_jvm_external~4.4.2//:extensions.bzl%maven": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "SNZtnmBkSzitA86+iyWV+lsMoWqTaHkbJeV673xyy3k=",
|
||||
"bzlTransitiveDigest": "vfN15bfa5VcQIt0lp3UZTznETp3NF8xw9pHYN+3Ma6A=",
|
||||
"accumulatedFileDigests": {
|
||||
"@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06"
|
||||
},
|
||||
@ -2668,12 +2698,24 @@
|
||||
"downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"rules_jvm_external~4.4.2",
|
||||
"bazel_tools",
|
||||
"bazel_tools"
|
||||
],
|
||||
[
|
||||
"rules_jvm_external~4.4.2",
|
||||
"rules_jvm_external",
|
||||
"rules_jvm_external~4.4.2"
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
"@@rules_jvm_external~4.4.2//:non-module-deps.bzl%non_module_deps": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "/rh2kt+7d77UiyuaTMepsRWJdj6Aot4FxGP6oW8S+U0=",
|
||||
"bzlTransitiveDigest": "zXwz7xFBNBig3QRyd5WAZU3y/6fZvd6jnP6EkJIutS0=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -2688,12 +2730,19 @@
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"rules_jvm_external~4.4.2",
|
||||
"bazel_tools",
|
||||
"bazel_tools"
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
"@@rules_python~0.10.2//python:extensions.bzl%pip_install": {
|
||||
"general": {
|
||||
"bzlTransitiveDigest": "CBgAHij2PzinIkeOkoRJcllj6whJIQ5eOHaHNfKikpU=",
|
||||
"bzlTransitiveDigest": "7AvdSiZR6OSZZhgJCJJYhrJbhi7tTP1EGFGu68oep00=",
|
||||
"accumulatedFileDigests": {},
|
||||
"envVariables": {},
|
||||
"generatedRepoSpecs": {
|
||||
@ -2796,7 +2845,19 @@
|
||||
"build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"recordedRepoMappingEntries": [
|
||||
[
|
||||
"rules_python~0.10.2",
|
||||
"bazel_tools",
|
||||
"bazel_tools"
|
||||
],
|
||||
[
|
||||
"rules_python~0.10.2",
|
||||
"rules_python",
|
||||
"rules_python~0.10.2"
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1023,6 +1023,9 @@ let
|
||||
# Bump the maximum number of CPUs to support systems like EC2 x1.*
|
||||
# instances and Xeon Phi.
|
||||
NR_CPUS = freeform "384";
|
||||
|
||||
# Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces)
|
||||
LED_TRIGGER_PHY = whenAtLeast "4.10" yes;
|
||||
} // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
|
||||
# Enables support for the Allwinner Display Engine 2.0
|
||||
SUN8I_DE2_CCU = yes;
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
"hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.77",
|
||||
"hash": "sha256:07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v"
|
||||
"version": "6.1.78",
|
||||
"hash": "sha256:12fn23m2xwdlv6gr1s8872lk8mvigqkblvlhr54nh8rik2b6n835"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.148",
|
||||
@ -28,11 +28,11 @@
|
||||
"hash": "sha256:06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.16",
|
||||
"hash": "sha256:0c5a9agdr27bwd1z6790whczb858z8i34hhn548lzbdylfamf7dj"
|
||||
"version": "6.6.17",
|
||||
"hash": "sha256:0si20m9ckir826jg40bh7sh4kwlp610rnc3gwsgs4nm7dfcm0xpf"
|
||||
},
|
||||
"6.7": {
|
||||
"version": "6.7.4",
|
||||
"hash": "sha256:036nk3h7vqzd7gnxan2173kpss5qm2pci1lvd58gh90azigrz3gn"
|
||||
"version": "6.7.5",
|
||||
"hash": "sha256:1zrralagnv9yr8qdg7lc05735691dbh92mgwfyxrq5xqc504dxi9"
|
||||
}
|
||||
}
|
||||
|
||||
@ -129,12 +129,17 @@ stdenv.mkDerivation {
|
||||
++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm
|
||||
++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
env.NIX_CFLAGS_COMPILE = toString ([
|
||||
"-Wno-error=cpp"
|
||||
"-Wno-error=bool-compare"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=stringop-truncation"
|
||||
];
|
||||
] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "13") [
|
||||
# Workaround gcc bug that causes enev simplest `perf top` runs to
|
||||
# crash: https://gcc.gnu.org/PR111009.
|
||||
# Can be removed once gcc-13 is updated past 13.2.0.
|
||||
"-O1"
|
||||
]);
|
||||
|
||||
doCheck = false; # requires "sparse"
|
||||
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
web-assets = fetchurl {
|
||||
url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
|
||||
hash = "sha256-Iyqn0/VyigmOhlyyz1NfvNIXmWtF617QbWzM2c7jHWw=";
|
||||
hash = "sha256-xC1Acm/CJHXTblV8E63vZB+r/ktBH7EytL7x4eWGko8=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
@ -23,7 +23,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VQnE4Xff4gtjQ6V2B42zK8UjosBWEMgcL/3Q8S0wc5Q=";
|
||||
hash = "sha256-zjmIa25veVL0ruFow4c1oV+VtgJGgWrRL99GPdaNc4g";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -8,21 +8,28 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mattermost";
|
||||
version = "8.1.7";
|
||||
version = "8.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mattermost";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZpjdJ1Uck0kM+togUKpxRij8V0jQX+12Meks+L1Tc90=";
|
||||
hash = "sha256-eloO83koCNZOR/NYzUCdKOtVdF7rk+VrZ9U2bKWkxNU=";
|
||||
} + "/server";
|
||||
|
||||
# this can probably be removed again in versions newer than 8.1.10
|
||||
overrideModAttrs = (_: {
|
||||
preBuild = ''
|
||||
go mod tidy
|
||||
'';
|
||||
});
|
||||
|
||||
webapp = fetchurl {
|
||||
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
||||
hash = "sha256-eORIoZLoxWdvuRlirJ7djBTgueIzlzIhRAoURy58zCA=";
|
||||
hash = "sha256-qxFW/P+INcMKSzaGZtOOr1Mi/glgZeiKvQ+YN0qX070=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RPnCAxksKppsjVtZYhwcoJuAmMJ85AstuoBFChKwAOk=";
|
||||
vendorHash = "sha256-ZbLSxG9Gyhk7PBC2V6sMtrQNXvm+ugMfliFIHWO1VLs=";
|
||||
|
||||
subPackages = [ "cmd/mattermost" ];
|
||||
|
||||
@ -37,6 +44,7 @@ buildGoModule rec {
|
||||
"-X github.com/mattermost/mattermost/server/public/model.BuildHash=v${version}"
|
||||
"-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=none"
|
||||
"-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false"
|
||||
"-X github.com/mattermost/mattermost/server/public/model.MockCWS=false"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "surrealdb";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "surrealdb";
|
||||
repo = "surrealdb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3xH0trwTs2Cr07/PtA4K808PUwaT6WmrIr2+11L7t6A=";
|
||||
hash = "sha256-ICQvAyBV+7cyHiwwiPEaoGT/W/pM4yiSpqByzkByRK4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dNn2HMZ7c/q/EhfMUHqWV79+3gMA9URqEozdEixkV/0=";
|
||||
cargoHash = "sha256-a9ZRr6U7mKCk2uaXJmCJMaCQxJ9adbRLMRUpJrsookk=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
||||
@ -111,6 +111,7 @@ with pkgs;
|
||||
fetchzip = callPackages ../build-support/fetchzip/tests.nix { };
|
||||
fetchgit = callPackages ../build-support/fetchgit/tests.nix { };
|
||||
fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { };
|
||||
fetchPypiLegacy = callPackages ../build-support/fetchpypilegacy/tests.nix { };
|
||||
|
||||
install-shell-files = callPackage ./install-shell-files {};
|
||||
|
||||
|
||||
@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2024.2.5";
|
||||
version = "2024.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dShe8h1aRDZPwzCKAhJag5xfylYqWJuCiB9A4afV8g0=";
|
||||
hash = "sha256-vBlO4Xxv5XM5KEZmIplSSb/LgdG485hQkb7RSRrOIyM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3yV26WZid5e7H9UsAaKLjSvL1MSQ+M5BjBR5Mt701Io=";
|
||||
cargoHash = "sha256-V+j0Z8voDzVdO2fHFw4boUvlFfCrOId7nkTZsZbCcfg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
@ -58,5 +58,9 @@ stdenv.mkDerivation rec {
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
maintainers = [ maintainers.suhr ];
|
||||
mainProgram = "wrapper";
|
||||
# Broken for Musl at 2024-01-17. Errors as:
|
||||
# logger.c:81:12: fatal error: gnu/libc-version.h: No such file or directory
|
||||
# Tracking issue: https://github.com/NixOS/nixpkgs/issues/281557
|
||||
broken = stdenv.hostPlatform.isMusl;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ascii";
|
||||
version = "3.19";
|
||||
version = "3.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-+dou/tgvJFZY+VYeW3VoCecerw5adzWsW+uSTN2ppWA=";
|
||||
sha256 = "sha256-nm5X6mDUGagDoCTOY2YlTvtxYma4Tu3VjNmA2rzBFnQ=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -1248,6 +1248,8 @@ with pkgs;
|
||||
|
||||
fetchPypi = callPackage ../build-support/fetchpypi { };
|
||||
|
||||
fetchPypiLegacy = callPackage ../build-support/fetchpypilegacy { };
|
||||
|
||||
resolveMirrorURLs = {url}: fetchurl {
|
||||
showURLs = true;
|
||||
inherit url;
|
||||
@ -11530,6 +11532,7 @@ with pkgs;
|
||||
|
||||
opendht = callPackage ../development/libraries/opendht {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
restinio = restinio_0_6;
|
||||
};
|
||||
|
||||
opendkim = callPackage ../development/libraries/opendkim { };
|
||||
@ -41724,6 +41727,7 @@ with pkgs;
|
||||
# TODO: remove once `udev` is `systemdMinimal` everywhere.
|
||||
udev = systemdMinimal;
|
||||
jack = libjack2;
|
||||
restinio = restinio_0_6;
|
||||
};
|
||||
|
||||
jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
|
||||
|
||||
@ -7039,7 +7039,7 @@ self: super: with self; {
|
||||
|
||||
meshtastic = callPackage ../development/python-modules/meshtastic { };
|
||||
|
||||
meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs
|
||||
meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overridePythonAttrs
|
||||
(oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently.
|
||||
setupHook = null;
|
||||
}));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user