mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5942e21e4e
@ -1234,6 +1234,12 @@
|
||||
githubId = 37040543;
|
||||
name = "Wroclaw";
|
||||
};
|
||||
amuckstot30 = {
|
||||
email = "amuckstot30@tutanota.com";
|
||||
github = "amuckstot30";
|
||||
githubId = 157274630;
|
||||
name = "amuckstot30";
|
||||
};
|
||||
amyipdev = {
|
||||
email = "amy@amyip.net";
|
||||
github = "amyipdev";
|
||||
|
||||
@ -73,6 +73,8 @@
|
||||
|
||||
- [Goatcounter](https://www.goatcounter.com/), Easy web analytics. No tracking of personal data. Available as [services.goatcounter](options.html#opt-services.goatcocunter.enable).
|
||||
|
||||
- [Privatebin](https://github.com/PrivateBin/PrivateBin/), A minimalist, open source online pastebin where the server has zero knowledge of pasted data. Available as [services.privatebin](#opt-services.privatebin.enable)
|
||||
|
||||
- [UWSM](https://github.com/Vladimir-csp/uwsm), a wayland session manager to wrap Wayland Compositors into useful systemd units such as `graphical-session.target`. Available as [programs.uwsm](#opt-programs.uwsm.enable).
|
||||
|
||||
- [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI
|
||||
|
||||
@ -1489,6 +1489,7 @@
|
||||
./services/web-apps/powerdns-admin.nix
|
||||
./services/web-apps/pretalx.nix
|
||||
./services/web-apps/pretix.nix
|
||||
./services/web-apps/privatebin.nix
|
||||
./services/web-apps/prosody-filer.nix
|
||||
./services/web-apps/rimgo.nix
|
||||
./services/web-apps/rutorrent.nix
|
||||
|
||||
@ -125,7 +125,7 @@ in
|
||||
};
|
||||
|
||||
systemd.slices.isolate = {
|
||||
description = "Isolate sandbox slice";
|
||||
description = "Isolate Sandbox Slice";
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ virchau13 ];
|
||||
|
||||
@ -657,7 +657,7 @@ in {
|
||||
|
||||
config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) {
|
||||
systemd.slices.system-bacula = {
|
||||
description = "Bacula Slice";
|
||||
description = "Bacula Backup System Slice";
|
||||
documentation = [ "man:bacula(8)" "https://www.bacula.org/" ];
|
||||
};
|
||||
|
||||
|
||||
@ -311,7 +311,7 @@ in
|
||||
];
|
||||
|
||||
systemd.slices.system-hydra = {
|
||||
description = "Hydra Slice";
|
||||
description = "Hydra CI Server Slice";
|
||||
documentation = [ "file://${cfg.package}/share/doc/hydra/index.html" "https://nixos.org/hydra/manual/" ];
|
||||
};
|
||||
|
||||
|
||||
@ -168,7 +168,7 @@ in
|
||||
type = lib.types.package;
|
||||
default = pkgs.go;
|
||||
defaultText = lib.literalExpression "pkgs.go";
|
||||
example = "pkgs.go_1_21";
|
||||
example = "pkgs.go_1_23";
|
||||
description = ''
|
||||
The Go package used by Athens at runtime.
|
||||
|
||||
|
||||
@ -234,7 +234,7 @@ in
|
||||
services.redis.servers.paperless.enable = mkIf enableRedis true;
|
||||
|
||||
systemd.slices.system-paperless = {
|
||||
description = "Paperless slice";
|
||||
description = "Paperless Document Management System Slice";
|
||||
documentation = [ "https://docs.paperless-ngx.com" ];
|
||||
};
|
||||
|
||||
|
||||
@ -86,7 +86,7 @@ in {
|
||||
|
||||
systemd.slices.system-rustdesk = {
|
||||
enable = true;
|
||||
description = "Slice designed to contain RustDesk Signal & RustDesk Relay";
|
||||
description = "RustDesk Remote Desktop Slice";
|
||||
};
|
||||
|
||||
systemd.targets.rustdesk = {
|
||||
|
||||
@ -179,7 +179,7 @@ in
|
||||
|
||||
systemd = {
|
||||
slices.system-samba = {
|
||||
description = "Samba slice";
|
||||
description = "Samba (SMB Networking Protocol) Slice";
|
||||
};
|
||||
targets.samba = {
|
||||
description = "Samba Server";
|
||||
|
||||
@ -165,7 +165,7 @@ in
|
||||
environment.etc."clamav/clamd.conf".source = clamdConfigFile;
|
||||
|
||||
systemd.slices.system-clamav = {
|
||||
description = "ClamAV slice";
|
||||
description = "ClamAV Antivirus Slice";
|
||||
};
|
||||
|
||||
systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
|
||||
|
||||
228
nixos/modules/services/web-apps/privatebin.nix
Normal file
228
nixos/modules/services/web-apps/privatebin.nix
Normal file
@ -0,0 +1,228 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.privatebin;
|
||||
|
||||
customToINI = lib.generators.toINI {
|
||||
mkKeyValue = lib.generators.mkKeyValueDefault {
|
||||
mkValueString =
|
||||
v:
|
||||
if v == true then
|
||||
''true''
|
||||
else if v == false then
|
||||
''false''
|
||||
else if builtins.isInt v then
|
||||
''${builtins.toString v}''
|
||||
else if builtins.isPath v then
|
||||
''"${builtins.toString v}"''
|
||||
else if builtins.isString v then
|
||||
''"${v}"''
|
||||
else
|
||||
lib.generators.mkValueStringDefault { } v;
|
||||
} "=";
|
||||
};
|
||||
|
||||
privatebinSettings = pkgs.writeTextDir "conf.php" (customToINI cfg.settings);
|
||||
|
||||
user = cfg.user;
|
||||
group = cfg.group;
|
||||
|
||||
defaultUser = "privatebin";
|
||||
defaultGroup = "privatebin";
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
options.services.privatebin = {
|
||||
|
||||
enable = lib.mkEnableOption "Privatebin: A minimalist, open source online
|
||||
pastebin where the server has zero knowledge of pasted data.";
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = defaultUser;
|
||||
description = "User account under which privatebin runs.";
|
||||
};
|
||||
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = if cfg.enableNginx then "nginx" else defaultGroup;
|
||||
defaultText = "If `services.privatebin.enableNginx` is true then `nginx` else ${defaultGroup}";
|
||||
description = ''
|
||||
Group under which privatebin runs. It is best to set this to the group
|
||||
of whatever webserver is being used as the frontend.
|
||||
'';
|
||||
};
|
||||
|
||||
dataDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = "/var/lib/privatebin";
|
||||
description = ''
|
||||
The place where privatebin stores its state.
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "privatebin" { };
|
||||
|
||||
enableNginx = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable nginx or not. If enabled, an nginx virtual host will
|
||||
be created for access to firefly-iii. If not enabled, then you may use
|
||||
`''${config.services.firefly-iii.package}` as your document root in
|
||||
whichever webserver you wish to setup.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualHost = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "localhost";
|
||||
description = ''
|
||||
The hostname at which you wish privatebin to be served. If you have
|
||||
enabled nginx using `services.privatebin.enableNginx` then this will
|
||||
be used.
|
||||
'';
|
||||
};
|
||||
|
||||
poolConfig = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.oneOf [
|
||||
lib.types.str
|
||||
lib.types.int
|
||||
lib.types.bool
|
||||
]
|
||||
);
|
||||
defaultText = lib.literalExpression ''
|
||||
{
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 32;
|
||||
"pm.start_servers" = 2;
|
||||
"pm.min_spare_servers" = 2;
|
||||
"pm.max_spare_servers" = 4;
|
||||
"pm.max_requests" = 500;
|
||||
}
|
||||
'';
|
||||
default = { };
|
||||
description = ''
|
||||
Options for the PrivateBin PHP pool. See the documentation on <literal>php-fpm.conf</literal>
|
||||
for details on configuration directives.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
default = { };
|
||||
description = ''
|
||||
Options for privatebin configuration. Refer to
|
||||
<https://github.com/PrivateBin/PrivateBin/wiki/Configuration> for
|
||||
details on supported values.
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
main = {
|
||||
name = "NixOS Based Privatebin";
|
||||
discussion = false;
|
||||
defaultformatter = "plalib.types.intext";
|
||||
qrcode = true
|
||||
};
|
||||
model.class = "Filesystem";
|
||||
model_options.dir = "/var/lib/privatebin/data";
|
||||
}
|
||||
'';
|
||||
type = lib.types.submodule { freeformType = lib.types.attrsOf lib.types.anything; };
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
services.privatebin.settings = {
|
||||
main = lib.mkDefault { };
|
||||
model.class = lib.mkDefault "Filesystem";
|
||||
model_options.dir = lib.mkDefault "${cfg.dataDir}/data";
|
||||
purge.dir = lib.mkDefault "${cfg.dataDir}/purge";
|
||||
traffic = {
|
||||
dir = lib.mkDefault "${cfg.dataDir}/traffic";
|
||||
header = "X_FORWARDED_FOR";
|
||||
};
|
||||
};
|
||||
|
||||
services.phpfpm.pools.privatebin = {
|
||||
inherit user group;
|
||||
phpPackage = pkgs.php83;
|
||||
phpOptions = ''
|
||||
log_errors = on
|
||||
'';
|
||||
settings = {
|
||||
"listen.mode" = lib.mkDefault "0660";
|
||||
"listen.owner" = lib.mkDefault user;
|
||||
"listen.group" = lib.mkDefault group;
|
||||
"pm" = lib.mkDefault "dynamic";
|
||||
"pm.max_children" = lib.mkDefault 32;
|
||||
"pm.start_servers" = lib.mkDefault 2;
|
||||
"pm.min_spare_servers" = lib.mkDefault 2;
|
||||
"pm.max_spare_servers" = lib.mkDefault 4;
|
||||
"pm.max_requests" = lib.mkDefault 500;
|
||||
};
|
||||
phpEnv.CONFIG_PATH = lib.strings.removeSuffix "/conf.php" (builtins.toString privatebinSettings);
|
||||
};
|
||||
|
||||
services.nginx = lib.mkIf cfg.enableNginx {
|
||||
enable = true;
|
||||
recommendedTlsSettings = lib.mkDefault true;
|
||||
recommendedOptimisation = lib.mkDefault true;
|
||||
recommendedGzipSettings = lib.mkDefault true;
|
||||
virtualHosts.${cfg.virtualHost} = {
|
||||
root = "${cfg.package}";
|
||||
locations = {
|
||||
"/" = {
|
||||
tryFiles = "$uri $uri/ /index.php?$query_string";
|
||||
index = "index.php";
|
||||
extraConfig = ''
|
||||
sendfile off;
|
||||
'';
|
||||
};
|
||||
"~ \.php$" = {
|
||||
extraConfig = ''
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params ;
|
||||
fastcgi_param SCRIPT_FILENAME $request_filename;
|
||||
fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.privatebin.socket};
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.settings."10-privatebin" =
|
||||
lib.attrsets.genAttrs
|
||||
[
|
||||
"${cfg.dataDir}/data"
|
||||
"${cfg.dataDir}/traffic"
|
||||
"${cfg.dataDir}/purge"
|
||||
]
|
||||
(n: {
|
||||
d = {
|
||||
group = group;
|
||||
mode = "0750";
|
||||
user = user;
|
||||
};
|
||||
});
|
||||
|
||||
users = {
|
||||
users = lib.mkIf (user == defaultUser) {
|
||||
${defaultUser} = {
|
||||
description = "Privatebin service user";
|
||||
inherit group;
|
||||
isSystemUser = true;
|
||||
home = cfg.dataDir;
|
||||
};
|
||||
};
|
||||
groups = lib.mkIf (group == defaultGroup) { ${defaultGroup} = { }; };
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -240,7 +240,7 @@ in {
|
||||
};
|
||||
|
||||
systemd.slices.system-phpfpm = {
|
||||
description = "PHP FastCGI Process manager pools slice";
|
||||
description = "PHP FastCGI Process Manager Slice";
|
||||
};
|
||||
|
||||
systemd.targets.phpfpm = {
|
||||
|
||||
@ -825,6 +825,7 @@ in {
|
||||
printing-socket = handleTest ./printing.nix { socket = true; };
|
||||
printing-service = handleTest ./printing.nix { socket = false; };
|
||||
private-gpt = handleTest ./private-gpt.nix {};
|
||||
privatebin = runTest ./privatebin.nix;
|
||||
privoxy = handleTest ./privoxy.nix {};
|
||||
prometheus = handleTest ./prometheus {};
|
||||
prometheus-exporters = handleTest ./prometheus-exporters.nix {};
|
||||
|
||||
@ -26,5 +26,13 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'")
|
||||
master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_raster;'")
|
||||
master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'")
|
||||
master.succeed("sudo -u postgres psql -c 'select postgis_version();'")
|
||||
master.succeed("[ \"$(sudo -u postgres psql --no-psqlrc --tuples-only -c 'select postgis_version();')\" = \" ${
|
||||
pkgs.lib.versions.major pkgs.postgis.version
|
||||
}.${
|
||||
pkgs.lib.versions.minor pkgs.postgis.version
|
||||
} USE_GEOS=1 USE_PROJ=1 USE_STATS=1\" ]")
|
||||
# st_makepoint goes through c code
|
||||
master.succeed("sudo -u postgres psql --no-psqlrc --tuples-only -c 'select st_makepoint(1, 1)'")
|
||||
'';
|
||||
})
|
||||
|
||||
21
nixos/tests/privatebin.nix
Normal file
21
nixos/tests/privatebin.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "privatebin";
|
||||
meta.maintainers = [ lib.maintainers.savyajha ];
|
||||
|
||||
nodes.dataImporter =
|
||||
{ ... }:
|
||||
{
|
||||
services.privatebin = {
|
||||
enable = true;
|
||||
enableNginx = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
dataImporter.wait_for_unit("phpfpm-privatebin.service")
|
||||
dataImporter.wait_for_unit("nginx.service")
|
||||
dataImporter.succeed("curl -fvvv -Ls http://localhost/ | grep 'PrivateBin'")
|
||||
'';
|
||||
}
|
||||
@ -2682,6 +2682,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/";
|
||||
};
|
||||
|
||||
copilot-lualine = buildVimPlugin {
|
||||
pname = "copilot-lualine";
|
||||
version = "2024-09-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndreM222";
|
||||
repo = "copilot-lualine";
|
||||
rev = "f40450c3e138766026327e7807877ea860618258";
|
||||
sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x";
|
||||
};
|
||||
meta.homepage = "https://github.com/AndreM222/copilot-lualine/";
|
||||
};
|
||||
|
||||
copilot-lua = buildVimPlugin {
|
||||
pname = "copilot.lua";
|
||||
version = "2024-09-11";
|
||||
|
||||
@ -561,6 +561,12 @@ in
|
||||
dependencies = with self; [ copilot-lua plenary-nvim ];
|
||||
};
|
||||
|
||||
copilot-lualine = super.copilot-lualine.overrideAttrs {
|
||||
dependencies = with self; [ copilot-lua lualine-nvim ];
|
||||
doInstallCheck = true;
|
||||
nvimRequireCheck = "copilot-lualine";
|
||||
};
|
||||
|
||||
copilot-vim = super.copilot-vim.overrideAttrs (old: {
|
||||
postInstall = ''
|
||||
substituteInPlace $out/autoload/copilot/client.vim \
|
||||
|
||||
@ -223,6 +223,7 @@ https://github.com/Olical/conjure/,,
|
||||
https://github.com/wellle/context.vim/,,
|
||||
https://github.com/Shougo/context_filetype.vim/,,
|
||||
https://github.com/zbirenbaum/copilot-cmp/,HEAD,
|
||||
https://github.com/AndreM222/copilot-lualine/,HEAD,
|
||||
https://github.com/zbirenbaum/copilot.lua/,HEAD,
|
||||
https://github.com/github/copilot.vim/,,
|
||||
https://github.com/ms-jpq/coq.artifacts/,HEAD,
|
||||
|
||||
@ -3903,6 +3903,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
pylyzer.pylyzer = callPackage ./pylyzer.pylyzer { };
|
||||
|
||||
pythagoratechnologies.gpt-pilot-vs-code = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "gpt-pilot-vs-code";
|
||||
|
||||
@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "mongodb-vscode";
|
||||
publisher = "mongodb";
|
||||
version = "1.8.1";
|
||||
hash = "sha256-dHvYl3bg5OB/HYBoHQnUODhAob/ZylFNGLAuUQByvdM=";
|
||||
version = "1.9.1";
|
||||
hash = "sha256-XWWBk/QW37Dg0RJJwJ65w1r9WGC6iAGCgigsnGm/ilc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{ lib, vscode-utils }:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "pylyzer";
|
||||
publisher = "pylyzer";
|
||||
version = "0.1.8";
|
||||
hash = "sha256-GoY4cobxL64bREtgl7q/iR66axSM3tBrle/b9h3ED8Q=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A VS Code extension for Pylyzer, a fast static code analyzer & language server for Python";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=pylyzer.pylyzer";
|
||||
homepage = "https://github.com/mtshiba/pylyzer/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, buildGo121Module
|
||||
, buildGo122Module
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
@ -61,17 +60,7 @@ rec {
|
||||
|
||||
nomad_1_5 = throwUnsupportaed "nomad_1_5";
|
||||
|
||||
nomad_1_6 = generic {
|
||||
buildGoModule = buildGo121Module;
|
||||
version = "1.6.10";
|
||||
sha256 = "sha256-kiMdpJzjF0S7lrTX3sBFkWm0Gac9a+qlwCPcMKeVXXQ=";
|
||||
vendorHash = "sha256-qnsPPV/NWTrqUa1v1CL16WfCH7B0zW9ZSnEmtqvotqI=";
|
||||
license = lib.licenses.mpl20;
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
'';
|
||||
};
|
||||
nomad_1_6 = throwUnsupportaed "nomad_1_6";
|
||||
|
||||
nomad_1_7 = generic {
|
||||
buildGoModule = buildGo122Module;
|
||||
|
||||
@ -156,11 +156,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wavebox";
|
||||
version = "10.129.27-2";
|
||||
version = "10.129.29-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-SHlKsiDS0UoOxy3vzGD7Ae7h6GM+r+XzFHZ33uEuEko=";
|
||||
hash = "sha256-HGzBvCv6ASW2wXMd0BrA6NNGAEsuN2yHwS+0WbABfWM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -34,7 +34,7 @@ let
|
||||
davinci = (
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
|
||||
version = "19.0.1";
|
||||
version = "19.0.2";
|
||||
|
||||
nativeBuildInputs = [
|
||||
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
|
||||
@ -55,8 +55,8 @@ let
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash =
|
||||
if studioVariant
|
||||
then "sha256-dtwweoxUE/DwHoqwKCTp7vQUg09h4/TrNl92hpOKd1E="
|
||||
else "sha256-MNaP0+sKBH4Ps5EMM5Gtdncai+rXZRmIQBXF5lVbDws=";
|
||||
then "sha256-q11stWFWRDUebAUzGH23R3Spd3EdDG85+6yB/srYCJY="
|
||||
else "sha256-dYTrO0wpIN68WhBovmYLK5uWOQ1nubpSyKqPCDMPMiM=";
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brainflow";
|
||||
version = "5.13.3";
|
||||
version = "5.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainflow-dev";
|
||||
repo = "brainflow";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-LFiDyNuWbEAKU0Rl+n7ozxr5CM4NLphR2o9bYHw6xJY=";
|
||||
hash = "sha256-cnItKuOu4ez54mAyRuk8PDC3oKKUIqdkAUuuaxNs5Z8=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
let
|
||||
argset = {
|
||||
pname = "chezmoi";
|
||||
version = "2.52.2";
|
||||
version = "2.52.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${argset.version}";
|
||||
hash = "sha256-SSwQQoHCcSVHMEpngpmdTThhwrob5/0TP9nQhOD6+1U=";
|
||||
hash = "sha256-OoVf0Gxyd+hTlM4VOei1atNEZYL2ZF3eKAHyUqRkRzs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t+lw1AtYnCBjJT+/pQZ71xycx4dJggqz08dNonbkP74=";
|
||||
vendorHash = "sha256-QJkTscj3MvmscanEqA9Md2OZPYoNtxIJsAd2J6E9zHk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clang-uml";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bkryza";
|
||||
repo = "clang-uml";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-PEzTvwW/wUg8wgKjeNGbpgpP3SH2sVWRYc6o3gFjxx0=";
|
||||
hash = "sha256-YzHlauVuFLT2PmfqJBNwqQ/P7d7tyl3brk7Vo/kTOF4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csv-tui";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nathangavin";
|
||||
repo = "csv-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IRXLwZ2FHcCDmDVJ0xnV/4q+X2AFXPX/+Ph4Xxo3DyM=";
|
||||
hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-wgeVcX0zSXffAuvKw2eKXC846WlC8F9UGMoxP3IXoLE=";
|
||||
cargoHash = "sha256-WDUw539G15rf2X1NWLRCHIxMqyuxthEy8Cbn5XgIFCk=";
|
||||
|
||||
meta = {
|
||||
description = "Terminal based csv editor which is designed to be memory efficient but still useful";
|
||||
|
||||
48
pkgs/by-name/ma/mangl/package.nix
Normal file
48
pkgs/by-name/ma/mangl/package.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
glfw,
|
||||
freetype,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mangl";
|
||||
version = "1.1.5-unstable-2024-07-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigalenarcic";
|
||||
repo = "mangl";
|
||||
rev = "9d369fb0b9637969bbdfaafca73832fe8a31445b";
|
||||
hash = "sha256-22JnflZtlkjI3wr6UHweb77pOk9cMwF+c6KORutCSDM=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
freetype
|
||||
glfw
|
||||
bzip2
|
||||
zlib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm0555 mangl -t $out/bin
|
||||
install -Dm0444 mangl.1 -t $out/man/man1
|
||||
install -Dm0444 art/mangl.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
install -Dm0444 mangl.desktop -t $out/share/applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/zigalenarcic/mangl";
|
||||
description = "A graphical man page viewer based on the mandoc library";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ nrabulinski ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "mangl";
|
||||
};
|
||||
}
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mihomo";
|
||||
version = "1.18.8";
|
||||
version = "1.18.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "mihomo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UImkDjfNbC59SkoR0SsmlxGO5UPjMA0IURj+2+zgsVQ=";
|
||||
hash = "sha256-WVzJymXmtPV5AGYYuFDlrhy5Hh9eUBOFG8UhAnFZ22g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lrd+og6bOopbV/JDwfWY4X+D/2iOCMgDA+JlHJlxwXE=";
|
||||
vendorHash = "sha256-A10XICoieWc0FJAn2G2aolefLjguwL72qrr4KjMFYZE=";
|
||||
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
|
||||
@ -66,15 +66,15 @@ stdenv.mkDerivation (finalAttrs:
|
||||
|
||||
in {
|
||||
pname = "neovim-unwrapped";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OsHIacgorYnB/dPbzl1b6rYUzQdhTtsJYLsFLJxregk=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-+qjjelYMB3MyjaESfCaGoeBURUzSVh/50uxUqStxIfY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
36
pkgs/by-name/po/postmoogle/package.nix
Normal file
36
pkgs/by-name/po/postmoogle/package.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "postmoogle";
|
||||
version = "0.9.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etkecc";
|
||||
repo = "postmoogle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/AuxrIvxoKb08uf4EOYXorl7vJ99KgEH9DZYLidDzI4=";
|
||||
};
|
||||
|
||||
tags = [
|
||||
"timetzdata"
|
||||
"goolm"
|
||||
];
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/postmoogle
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server";
|
||||
homepage = "https://github.com/etkecc/postmoogle";
|
||||
changelog = "https://github.com/etkecc/postmoogle/releases/tag/v0.9.21";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ amuckstot30 ];
|
||||
mainProgram = "postmoogle";
|
||||
};
|
||||
}
|
||||
34
pkgs/by-name/pr/privatebin/package.nix
Normal file
34
pkgs/by-name/pr/privatebin/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "privatebin";
|
||||
version = "1.7.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrivateBin";
|
||||
repo = "PrivateBin";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-RFP6rhzfBzTmqs4eJXv7LqdniWoeBJpQQ6fLdoGd5Fk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -R $src/* $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.privatebin;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/PrivateBin/PrivateBin/releases/tag/${finalAttrs.version}";
|
||||
description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data.";
|
||||
homepage = "https://privatebin.info";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.savyajha ];
|
||||
};
|
||||
})
|
||||
83
pkgs/by-name/py/pylyzer/Cargo.lock
generated
83
pkgs/by-name/py/pylyzer/Cargo.lock
generated
@ -43,9 +43,9 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.3.0"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
|
||||
|
||||
[[package]]
|
||||
name = "backtrace"
|
||||
@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.21"
|
||||
version = "1.1.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
|
||||
checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
@ -134,7 +134,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustc_version",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||
|
||||
[[package]]
|
||||
name = "els"
|
||||
version = "0.1.57-nightly.3"
|
||||
version = "0.1.58-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa300ad75154fdc24c02e66148c5fb15aff48a2cfe8dd18191deb239ba5bcc64"
|
||||
checksum = "eed2c90d92d8be15be9e928f06d34e0cfe03c8c10e6351326859cecf3789dcac"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
@ -159,9 +159,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_common"
|
||||
version = "0.6.45-nightly.3"
|
||||
version = "0.6.46-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a750b2538983b9a967f1d8af9dddfc23d2a75f1c84ecaeb88e171dcb047c185"
|
||||
checksum = "4758c25017a49a7f3d8cb3287360deae39c696936a6747cf9e3d9f81cb94c010"
|
||||
dependencies = [
|
||||
"backtrace-on-stack-overflow",
|
||||
"erg_proc_macros",
|
||||
@ -172,9 +172,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_compiler"
|
||||
version = "0.6.45-nightly.3"
|
||||
version = "0.6.46-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e65b36a8419d694b11effc1e123d9ff16ac50d677950d9b60f47e8bc2429be7b"
|
||||
checksum = "8c5c7fad1c74774dcbc293b79bb62a024135fcde4faf13411a3490761cb71a98"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_parser",
|
||||
@ -182,9 +182,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_parser"
|
||||
version = "0.6.45-nightly.3"
|
||||
version = "0.6.46-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ec2dd2b5827961fffe7bdbc253a904de0104d0b7677a61faa3c9e47d21aac5e"
|
||||
checksum = "c564e2914429af720277cb61256362762790da8c635558f77c4d6ae4c3a64f3a"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_proc_macros",
|
||||
@ -193,9 +193,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_proc_macros"
|
||||
version = "0.6.45-nightly.3"
|
||||
version = "0.6.46-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4df44f047bae2eae631309bb3f692daaa0a9724eca8e59104cdf57336c55ad45"
|
||||
checksum = "3fac38f9d18406130093186708186dad6f59efc04b0eddc0a8d0364be9361a90"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
@ -264,7 +264,7 @@ dependencies = [
|
||||
"Inflector",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -290,9 +290,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.158"
|
||||
version = "0.2.159"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
|
||||
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
@ -464,9 +464,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.19.0"
|
||||
version = "1.20.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
|
||||
dependencies = [
|
||||
"portable-atomic",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
@ -541,6 +544,12 @@ dependencies = [
|
||||
"siphasher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.20"
|
||||
@ -561,7 +570,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "py2erg"
|
||||
version = "0.0.63"
|
||||
version = "0.0.64"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
@ -571,7 +580,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pylyzer"
|
||||
version = "0.0.63"
|
||||
version = "0.0.64"
|
||||
dependencies = [
|
||||
"els",
|
||||
"erg_common",
|
||||
@ -581,7 +590,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pylyzer_core"
|
||||
version = "0.0.63"
|
||||
version = "0.0.64"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
@ -592,7 +601,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pylyzer_wasm"
|
||||
version = "0.0.63"
|
||||
version = "0.0.64"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
@ -641,9 +650,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.4"
|
||||
version = "0.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
|
||||
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
]
|
||||
@ -757,7 +766,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -780,7 +789,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -820,9 +829,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.77"
|
||||
version = "2.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
|
||||
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -917,9 +926,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicode-bidi"
|
||||
version = "0.3.15"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
|
||||
checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
@ -1025,7 +1034,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@ -1047,7 +1056,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
@ -1089,7 +1098,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1100,7 +1109,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1204,5 +1213,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.77",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
@ -10,19 +10,18 @@
|
||||
darwin,
|
||||
which,
|
||||
nix-update-script,
|
||||
testers,
|
||||
pylyzer,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.63";
|
||||
version = "0.0.64";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nTaU5rfY/Kp2vZLNzFvEtsnpVtcjOC17sXYywZNDvIk=";
|
||||
hash = "sha256-ShH394FgmuDrArIvz+okVJKWffVVFhsuVWaWFquW2GU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -63,9 +62,14 @@ rustPlatform.buildRustPackage rec {
|
||||
wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = pylyzer; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripunzip";
|
||||
version = "1.2.3";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "ripunzip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9aBAksX4h8DlHTl95xd2QvFi3ZV/6i69b68OFa4B1Ew=";
|
||||
hash = "sha256-O9R7SmhKQ6VB9TWbLsQmK/0tDWhJ1QWIPwW7VtibqAk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QyVhEHm1W4kb5b4dngBui3lT7vKBGDS5ZObMWua96KM=";
|
||||
cargoHash = "sha256-1ZHAbJIWRQh876rshMYeuCz7UMlwdqrScO0eIkGjZao=";
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tile38";
|
||||
version = "1.33.2";
|
||||
version = "1.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidwall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-+HclPZOVBa5cEAuUr5R40+CHI58yZJ6uo8qM06IAgQw=";
|
||||
hash = "sha256-r13STmaDJz4OGboNPsrJSi668q72Bzffe5TRXJk6pdI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY=";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "twemoji-color-font";
|
||||
version = "14.0.2";
|
||||
version = "15.0.3";
|
||||
|
||||
# We fetch the prebuilt font because building it takes 1.5 hours on hydra.
|
||||
# Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
|
||||
src = fetchurl {
|
||||
url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-aCbiHqCNxd8myIeuTlYEaYfg9JCd+MAsc94FcUoDU8E=";
|
||||
sha256 = "sha256-3mpcuQ3BaEyPmCMOrfWLA4XE9UkfbAgoIwF9nKHT7Ho=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
{ fetchFromGitHub
|
||||
, gradle_7
|
||||
, jdk11
|
||||
, lib
|
||||
, stdenv
|
||||
, rsync
|
||||
, runCommand
|
||||
, testers
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gradle_7,
|
||||
jdk11,
|
||||
lib,
|
||||
stdenv,
|
||||
rsync,
|
||||
runCommand,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
corretto = import ./mk-corretto.nix rec {
|
||||
inherit lib stdenv rsync runCommand testers;
|
||||
inherit
|
||||
lib
|
||||
stdenv
|
||||
rsync
|
||||
runCommand
|
||||
testers
|
||||
;
|
||||
jdk = jdk11;
|
||||
gradle = gradle_7;
|
||||
extraConfig = [
|
||||
@ -19,12 +26,12 @@ let
|
||||
# Corretto, too.
|
||||
"--disable-warnings-as-errors"
|
||||
];
|
||||
version = "11.0.23.9.1";
|
||||
version = "11.0.24.8.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "corretto";
|
||||
repo = "corretto-11";
|
||||
rev = version;
|
||||
sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI=";
|
||||
sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,34 +1,43 @@
|
||||
{ fetchFromGitHub
|
||||
, fetchurl
|
||||
, gradle_7
|
||||
, jdk17
|
||||
, lib
|
||||
, stdenv
|
||||
, rsync
|
||||
, runCommand
|
||||
, testers
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
gradle_7,
|
||||
jdk17,
|
||||
lib,
|
||||
stdenv,
|
||||
rsync,
|
||||
runCommand,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
corretto = import ./mk-corretto.nix rec {
|
||||
inherit lib stdenv rsync runCommand testers;
|
||||
inherit
|
||||
lib
|
||||
stdenv
|
||||
rsync
|
||||
runCommand
|
||||
testers
|
||||
;
|
||||
jdk = jdk17;
|
||||
gradle = gradle_7;
|
||||
version = "17.0.11.9.1";
|
||||
version = "17.0.12.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "corretto";
|
||||
repo = "corretto-17";
|
||||
rev = version;
|
||||
sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0=";
|
||||
sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE=";
|
||||
};
|
||||
};
|
||||
in
|
||||
corretto.overrideAttrs (final: prev: {
|
||||
# HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply.
|
||||
patches = lib.remove
|
||||
(fetchurl {
|
||||
corretto.overrideAttrs (
|
||||
final: prev: {
|
||||
# Corretto17 has incorporated this patch already so it fails to apply.
|
||||
# We thus skip it here.
|
||||
# See https://github.com/corretto/corretto-17/pull/158
|
||||
patches = lib.remove (fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
|
||||
sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
|
||||
})
|
||||
(prev.patches or [ ]);
|
||||
})
|
||||
}) (prev.patches or [ ]);
|
||||
}
|
||||
)
|
||||
|
||||
@ -1,25 +1,32 @@
|
||||
{ corretto21
|
||||
, fetchFromGitHub
|
||||
, gradle_7
|
||||
, jdk21
|
||||
, lib
|
||||
, stdenv
|
||||
, rsync
|
||||
, runCommand
|
||||
, testers
|
||||
{
|
||||
corretto21,
|
||||
fetchFromGitHub,
|
||||
gradle_7,
|
||||
jdk21,
|
||||
lib,
|
||||
stdenv,
|
||||
rsync,
|
||||
runCommand,
|
||||
testers,
|
||||
}:
|
||||
|
||||
let
|
||||
corretto = import ./mk-corretto.nix rec {
|
||||
inherit lib stdenv rsync runCommand testers;
|
||||
inherit
|
||||
lib
|
||||
stdenv
|
||||
rsync
|
||||
runCommand
|
||||
testers
|
||||
;
|
||||
jdk = jdk21;
|
||||
gradle = gradle_7;
|
||||
version = "21.0.3.9.1";
|
||||
version = "21.0.4.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "corretto";
|
||||
repo = "corretto-21";
|
||||
rev = version;
|
||||
sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0=";
|
||||
sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ jdk
|
||||
, version
|
||||
, src
|
||||
, lib
|
||||
, stdenv
|
||||
, gradle
|
||||
, extraConfig ? [ ]
|
||||
, rsync
|
||||
, runCommand
|
||||
, testers
|
||||
{
|
||||
jdk,
|
||||
version,
|
||||
src,
|
||||
lib,
|
||||
stdenv,
|
||||
gradle,
|
||||
extraConfig ? [ ],
|
||||
rsync,
|
||||
runCommand,
|
||||
testers,
|
||||
}:
|
||||
|
||||
# Each Corretto version is based on a corresponding OpenJDK version. So
|
||||
@ -19,97 +20,111 @@
|
||||
|
||||
let
|
||||
pname = "corretto";
|
||||
# The version scheme is different between OpenJDK & Corretto.
|
||||
# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40
|
||||
# "major.minor.security.build.revision"
|
||||
in
|
||||
jdk.overrideAttrs (finalAttrs: oldAttrs: {
|
||||
inherit pname version src;
|
||||
name = "${pname}-${version}";
|
||||
# The version scheme is different between OpenJDK & Corretto.
|
||||
# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40
|
||||
# "major.minor.security.build.revision"
|
||||
jdk.overrideAttrs (
|
||||
finalAttrs: oldAttrs: {
|
||||
inherit pname version src;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ];
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
|
||||
jdk
|
||||
gradle
|
||||
rsync
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontConfigure = true;
|
||||
|
||||
postPatch = let
|
||||
extra_config = builtins.concatStringsSep " " extraConfig;
|
||||
in ''
|
||||
# The rpm/deb task definitions require a Gradle plugin which we don't
|
||||
# have and so the build fails. We'll simply remove them here because
|
||||
# they are not needed anyways.
|
||||
rm -rf installers/linux/universal/{rpm,deb}
|
||||
postPatch =
|
||||
let
|
||||
extra_config = builtins.concatStringsSep " " extraConfig;
|
||||
in
|
||||
''
|
||||
# The rpm/deb task definitions require a Gradle plugin which we don't
|
||||
# have and so the build fails. We'll simply remove them here because
|
||||
# they are not needed anyways.
|
||||
rm -rf installers/linux/universal/{rpm,deb}
|
||||
|
||||
# `/usr/bin/rsync` is invoked to copy the source tree. We don't have that.
|
||||
for file in $(find installers -name "build.gradle"); do
|
||||
substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'"
|
||||
done
|
||||
# `/usr/bin/rsync` is invoked to copy the source tree. We don't have that.
|
||||
for file in $(find installers -name "build.gradle"); do
|
||||
substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'"
|
||||
done
|
||||
|
||||
gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}")
|
||||
'';
|
||||
gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}")
|
||||
'';
|
||||
|
||||
# since we dontConfigure, we must run this manually
|
||||
preBuild = "gradleConfigureHook";
|
||||
# since we dontConfigure, we must run this manually
|
||||
preBuild = "gradleConfigureHook";
|
||||
|
||||
# The Linux installer is placed at linux/universal/tar whereas the MacOS
|
||||
# one is at mac/tar.
|
||||
gradleBuildTask =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
":installers:mac:tar:build"
|
||||
else ":installers:linux:universal:tar:packageBuildResults";
|
||||
# The Linux installer is placed at linux/universal/tar whereas the MacOS
|
||||
# one is at mac/tar.
|
||||
gradleBuildTask =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
":installers:mac:tar:build"
|
||||
else
|
||||
":installers:linux:universal:tar:packageBuildResults";
|
||||
|
||||
postBuild = ''
|
||||
# Prepare for the installPhase so that it looks like if a normal
|
||||
# OpenJDK had been built.
|
||||
dir=build/jdkImageName/images
|
||||
mkdir -p $dir
|
||||
file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz')
|
||||
tar -xzf $file -C $dir
|
||||
mv $dir/amazon-corretto-* $dir/jdk
|
||||
'' + oldAttrs.postBuild or "";
|
||||
postBuild =
|
||||
''
|
||||
# Prepare for the installPhase so that it looks like if a normal
|
||||
# OpenJDK had been built.
|
||||
dir=build/jdkImageName/images
|
||||
mkdir -p $dir
|
||||
file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz')
|
||||
tar -xzf $file -C $dir
|
||||
mv $dir/amazon-corretto-* $dir/jdk
|
||||
''
|
||||
+ oldAttrs.postBuild or "";
|
||||
|
||||
installPhase = oldAttrs.installPhase + ''
|
||||
# The installPhase will place everything in $out/lib/openjdk and
|
||||
# reference through symlinks. We don't rewrite the installPhase but at
|
||||
# least move the folder to convey that this is not OpenJDK anymore.
|
||||
mv $out/lib/openjdk $out/lib/corretto
|
||||
ln -s $out/lib/corretto $out/lib/openjdk
|
||||
'';
|
||||
installPhase =
|
||||
oldAttrs.installPhase
|
||||
+ ''
|
||||
# The installPhase will place everything in $out/lib/openjdk and
|
||||
# reference through symlinks. We don't rewrite the installPhase but at
|
||||
# least move the folder to convey that this is not OpenJDK anymore.
|
||||
mv $out/lib/openjdk $out/lib/corretto
|
||||
ln -s $out/lib/corretto $out/lib/openjdk
|
||||
'';
|
||||
|
||||
passthru =
|
||||
let
|
||||
pkg = finalAttrs.finalPackage;
|
||||
in
|
||||
oldAttrs.passthru // {
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = pkg;
|
||||
passthru =
|
||||
let
|
||||
pkg = finalAttrs.finalPackage;
|
||||
in
|
||||
oldAttrs.passthru
|
||||
// {
|
||||
tests = {
|
||||
version = testers.testVersion { package = pkg; };
|
||||
vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } ''
|
||||
output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor)
|
||||
grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out
|
||||
'';
|
||||
compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } ''
|
||||
cat << EOF > Main.java
|
||||
class Main {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello, World!");
|
||||
}
|
||||
}
|
||||
EOF
|
||||
${pkg}/bin/javac Main.java
|
||||
${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out
|
||||
'';
|
||||
};
|
||||
vendor = runCommand "${pname}-vendor" { nativeBuildInputs = [ pkg ]; } ''
|
||||
output=$(${pkg.meta.mainProgram} -XshowSettings:properties -version 2>&1 | grep vendor)
|
||||
grep -Fq "java.vendor = Amazon.com Inc." - <<< "$output" && touch $out
|
||||
'';
|
||||
compiler = runCommand "${pname}-compiler" { nativeBuildInputs = [ pkg ]; } ''
|
||||
cat << EOF > Main.java
|
||||
class Main {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello, World!");
|
||||
}
|
||||
}
|
||||
EOF
|
||||
${pkg}/bin/javac Main.java
|
||||
${pkg}/bin/java Main | grep -q "Hello, World!" && touch $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# Some of the OpenJDK derivation set their `pos` by hand. We need to
|
||||
# overwrite this in order to point to Corretto, not OpenJDK.
|
||||
pos = __curPos;
|
||||
meta = with lib; oldAttrs.meta // {
|
||||
homepage = "https://aws.amazon.com/corretto";
|
||||
license = licenses.gpl2Only;
|
||||
description = "Amazon's distribution of OpenJDK";
|
||||
maintainers = with maintainers; [ rollf ];
|
||||
};
|
||||
})
|
||||
# Some of the OpenJDK derivation set their `pos` by hand. We need to
|
||||
# overwrite this in order to point to Corretto, not OpenJDK.
|
||||
pos = __curPos;
|
||||
meta =
|
||||
with lib;
|
||||
oldAttrs.meta
|
||||
// {
|
||||
homepage = "https://aws.amazon.com/corretto";
|
||||
license = licenses.gpl2Only;
|
||||
description = "Amazon's distribution of OpenJDK";
|
||||
maintainers = with maintainers; [ rollf ];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@ -1,189 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, tzdata
|
||||
, substituteAll
|
||||
, iana-etc
|
||||
, Security
|
||||
, Foundation
|
||||
, xcbuild
|
||||
, mailcap
|
||||
, buildPackages
|
||||
, pkgsBuildTarget
|
||||
, threadsCross
|
||||
, testers
|
||||
, skopeo
|
||||
, buildGo121Module
|
||||
}:
|
||||
|
||||
let
|
||||
goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo121Module; };
|
||||
|
||||
goarch = platform: {
|
||||
"aarch64" = "arm64";
|
||||
"arm" = "arm";
|
||||
"armv5tel" = "arm";
|
||||
"armv6l" = "arm";
|
||||
"armv7l" = "arm";
|
||||
"i686" = "386";
|
||||
"mips" = "mips";
|
||||
"mips64el" = "mips64le";
|
||||
"mipsel" = "mipsle";
|
||||
"powerpc64" = "ppc64";
|
||||
"powerpc64le" = "ppc64le";
|
||||
"riscv64" = "riscv64";
|
||||
"s390x" = "s390x";
|
||||
"x86_64" = "amd64";
|
||||
}.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");
|
||||
|
||||
# We need a target compiler which is still runnable at build time,
|
||||
# to handle the cross-building case where build != host == target
|
||||
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
|
||||
|
||||
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.21.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-cfsxYGod5I0SnVkehxemPgxVZf+6CaJOqfiZoTIUw00=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
|
||||
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
|
||||
|
||||
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
|
||||
|
||||
depsBuildTarget = lib.optional isCross targetCC;
|
||||
|
||||
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./iana-etc-1.17.patch;
|
||||
iana = iana-etc;
|
||||
})
|
||||
# Patch the mimetype database location which is missing on NixOS.
|
||||
# but also allow static binaries built with NixOS to run outside nix
|
||||
(substituteAll {
|
||||
src = ./mailcap-1.17.patch;
|
||||
inherit mailcap;
|
||||
})
|
||||
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
|
||||
# that run outside a nix server
|
||||
(substituteAll {
|
||||
src = ./tzdata-1.19.patch;
|
||||
inherit tzdata;
|
||||
})
|
||||
./remove-tools-1.11.patch
|
||||
./go_no_vendor_checks-1.21.patch
|
||||
];
|
||||
|
||||
GOOS = stdenv.targetPlatform.parsed.kernel.name;
|
||||
GOARCH = goarch stdenv.targetPlatform;
|
||||
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
|
||||
# Go will nevertheless build a for host system that we will copy over in
|
||||
# the install phase.
|
||||
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
|
||||
GOHOSTARCH = goarch stdenv.buildPlatform;
|
||||
|
||||
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
|
||||
# to be different from CC/CXX
|
||||
CC_FOR_TARGET =
|
||||
if isCross then
|
||||
"${targetCC}/bin/${targetCC.targetPrefix}cc"
|
||||
else
|
||||
null;
|
||||
CXX_FOR_TARGET =
|
||||
if isCross then
|
||||
"${targetCC}/bin/${targetCC.targetPrefix}c++"
|
||||
else
|
||||
null;
|
||||
|
||||
GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
|
||||
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
# this is compiled into the binary
|
||||
export GOROOT_FINAL=$out/share/go
|
||||
|
||||
export PATH=$(pwd)/bin:$PATH
|
||||
|
||||
${lib.optionalString isCross ''
|
||||
# Independent from host/target, CC should produce code for the building system.
|
||||
# We only set it when cross-compiling.
|
||||
export CC=${buildPackages.stdenv.cc}/bin/cc
|
||||
''}
|
||||
ulimit -a
|
||||
|
||||
pushd src
|
||||
./make.bash
|
||||
popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Contains the wrong perl shebang when cross compiling,
|
||||
# since it is not used for anything we can deleted as well.
|
||||
rm src/regexp/syntax/make_perl_groups.pl
|
||||
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
|
||||
mv bin/*_*/* bin
|
||||
rmdir bin/*_*
|
||||
${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) ''
|
||||
rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
|
||||
''}
|
||||
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||
rm -rf bin/*_*
|
||||
${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) ''
|
||||
rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
|
||||
''}
|
||||
'');
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $GOROOT_FINAL
|
||||
cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL
|
||||
mkdir -p $out/bin
|
||||
ln -s $GOROOT_FINAL/bin/* $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
disallowedReferences = [ goBootstrap ];
|
||||
|
||||
passthru = {
|
||||
inherit goBootstrap skopeoTest;
|
||||
tests = {
|
||||
skopeo = testers.testVersion { package = skopeoTest; };
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "go version";
|
||||
version = "go${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
|
||||
description = "Go Programming language";
|
||||
homepage = "https://go.dev/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = teams.golang.members;
|
||||
platforms = platforms.darwin ++ platforms.linux ++ platforms.freebsd;
|
||||
mainProgram = "go";
|
||||
};
|
||||
})
|
||||
@ -1,23 +0,0 @@
|
||||
Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
|
||||
and replacements listed in the main module go.mod file, and it is a hard failure if
|
||||
vendor/modules.txt is missing.
|
||||
|
||||
Relax module consistency checks and switch back to pre go1.14 behaviour if
|
||||
vendor/modules.txt is missing regardless of go version requirement in go.mod.
|
||||
|
||||
This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
|
||||
See https://github.com/golang/go/issues/37948 for discussion.
|
||||
|
||||
diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
|
||||
index ffc79bb93f..2d0311975d 100644
|
||||
--- a/src/cmd/go/internal/modload/vendor.go
|
||||
+++ b/src/cmd/go/internal/modload/vendor.go
|
||||
@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFile *modfile.File) {
|
||||
readVendorList(MainModules.mustGetSingleMainModule())
|
||||
|
||||
pre114 := false
|
||||
- if gover.Compare(index.goVersion, "1.14") < 0 {
|
||||
+ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
|
||||
// Go versions before 1.14 did not include enough information in
|
||||
// vendor/modules.txt to check for consistency.
|
||||
// If we know that we're on an earlier version, relax the consistency check.
|
||||
@ -29,7 +29,7 @@ compcert = mkCoqDerivation {
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||
{ case = range "8.14" "8.19"; out = "3.14"; }
|
||||
{ case = range "8.14" "8.20"; out = "3.14"; }
|
||||
{ case = isEq "8.13" ; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
@ -201,13 +201,18 @@ patched_compcert = compcert.overrideAttrs (o:
|
||||
})
|
||||
];
|
||||
}
|
||||
{ cases = [ (isEq "8.19") (isEq "3.14") ];
|
||||
{ cases = [ (range "8.19" "8.20") (isEq "3.14") ];
|
||||
out = [
|
||||
# Support for Coq 8.19.2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch";
|
||||
hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk=";
|
||||
})
|
||||
# Support for Coq 8.20.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/20a5b48758bf8ac18e4c420df67017b371efc237.patch";
|
||||
hash = "sha256-TJ87CvLiAv1absGnPsTXsD/HQwKgS82loUTcosulyso=";
|
||||
})
|
||||
];
|
||||
}
|
||||
] [];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, enableQt ? enableQT
|
||||
, enableXM ? false
|
||||
, libGLX
|
||||
, enableOpenGLX11 ? !libGLX.meta.broken
|
||||
, enableOpenGLX11 ? !stdenv.isDarwin
|
||||
, enablePython ? false
|
||||
, enableRaytracerX11 ? false
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@ -19,22 +18,18 @@
|
||||
packaging,
|
||||
rich,
|
||||
tensorflow,
|
||||
pythonAtLeast,
|
||||
distutils,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "keras";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keras-team";
|
||||
repo = "keras";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hp+kKsKI2Jmh30/KeUZ+uBW0MG49+QgsyR5yCS63p08=";
|
||||
hash = "sha256-zbeGa4g2psAofYAVuM7BNWI2gI21e739N5ZtxVfnVUg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@ -53,7 +48,7 @@ buildPythonPackage rec {
|
||||
packaging
|
||||
rich
|
||||
tensorflow
|
||||
] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"keras"
|
||||
|
||||
@ -17,15 +17,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pystac";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stac-utils";
|
||||
repo = "pystac";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zJGDhKRX50Muo1YDEzfwypMLISnYBYKkPvUULYkUf68=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yuAam/sXaGMFp1Kwxd28v3nOV05GC3sUY+gKJ4nLwTs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,102 +1,34 @@
|
||||
{ buildBazelPackage
|
||||
, bazel_5
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, go_1_21
|
||||
, python3
|
||||
, lib, stdenv
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
testers,
|
||||
bazel-watcher,
|
||||
}:
|
||||
|
||||
let
|
||||
patches = [
|
||||
./use-go-in-path.patch
|
||||
];
|
||||
|
||||
# Patch the protoc alias so that it always builds from source.
|
||||
rulesProto = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "rules_proto";
|
||||
rev = "4.0.0";
|
||||
hash = "sha256-WVPZx14thneAC4PdiDhBibnPwlCKEF9c93CHR0t1Efo=";
|
||||
postFetch = ''
|
||||
sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release
|
||||
cat <<EOF >>$out/proto/private/BUILD.release
|
||||
alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"])
|
||||
EOF
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "bazel-watcher";
|
||||
version = "0.25.2";
|
||||
version = "0.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-watcher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lreGKA0DZiOd1bJq8NNQ+80cyDwiughoXCkKu1RaZmc=";
|
||||
hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go_1_21 git python3 ];
|
||||
removeRulesCC = false;
|
||||
vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU=";
|
||||
|
||||
bazel = bazel_5;
|
||||
bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ];
|
||||
bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ];
|
||||
bazelTargets = [ "//cmd/ibazel" ];
|
||||
CGO_ENABLED = "0";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system
|
||||
fetchAttrs = {
|
||||
inherit patches;
|
||||
subPackages = [ "cmd/ibazel" ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
|
||||
echo ${bazel_5.version} > .bazelversion
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Remove the go_sdk (it's just a copy of the go derivation) and all
|
||||
# references to it from the marker files. Bazel does not need to download
|
||||
# this sdk because we have patched the WORKSPACE file to point to the one
|
||||
# currently present in PATH. Without removing the go_sdk from the marker
|
||||
# file, the hash of it will change anytime the Go derivation changes and
|
||||
# that would lead to impurities in the marker files which would result in
|
||||
# a different hash for the fetch phase.
|
||||
rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
|
||||
sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
|
||||
|
||||
# Retains go build input markers
|
||||
chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker}
|
||||
rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker}
|
||||
|
||||
# Remove the gazelle tools, they contain go binaries that are built
|
||||
# non-deterministically. As long as the gazelle version matches the tools
|
||||
# should be equivalent.
|
||||
rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker}
|
||||
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
|
||||
|
||||
# remove com_google_protobuf because it had files with different permissions on linux and darwin
|
||||
rm -rf $bazelOut/external/com_google_protobuf
|
||||
'';
|
||||
|
||||
sha256 = "sha256-B2KVD/FmkAa7MNhLaH286gF3uA20qjN3CoA83KRB9E8=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
inherit patches;
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
|
||||
substituteInPlace cmd/ibazel/BUILD.bazel --replace '{STABLE_GIT_VERSION}' ${version}
|
||||
echo ${bazel_5.version} > .bazelversion
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 bazel-bin/cmd/ibazel/ibazel_/ibazel $out/bin/ibazel
|
||||
'';
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = bazel-watcher; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/WORKSPACE b/WORKSPACE
|
||||
index 51273b6..fcf9ffb 100644
|
||||
--- a/WORKSPACE
|
||||
+++ b/WORKSPACE
|
||||
@@ -61,7 +61,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
|
||||
|
||||
go_rules_dependencies()
|
||||
|
||||
-go_register_toolchains(version = "1.19.4")
|
||||
+go_register_toolchains(go_version = "host")
|
||||
|
||||
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "0.7.0",
|
||||
"url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.0/gauge-dotnet-0.7.0.zip",
|
||||
"hash": "sha256-u+Ir6Qlz7C8KNrfzy2wVrltkcruUZ954OaEwRtR52ds="
|
||||
"version": "0.7.1",
|
||||
"url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.1/gauge-dotnet-0.7.1.zip",
|
||||
"hash": "sha256-0sJctSdQfkm70Z1JDFMc2qwo0PbDWYlHbqfVsnlHyDg="
|
||||
}
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{
|
||||
"version": "0.11.0",
|
||||
"version": "0.11.1",
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.arm64.zip",
|
||||
"hash": "sha256-o7viYih6oghPipGmpsdGZXxtML4++Ux7Qul8pRzkdUc="
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.arm64.zip",
|
||||
"hash": "sha256-KoUVku5DRi6sUYCMJ5/DBEYv4NlNEcHdOlYGsfYR0Yw="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-darwin.x86_64.zip",
|
||||
"hash": "sha256-wTXVuyXU9mfVxAc/l0mgvKt3c/jinffILBUhe/tikgs="
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-darwin.x86_64.zip",
|
||||
"hash": "sha256-ea2s3b38MG8r7i6IqlOjQ2Wc7b237Eu1VL7euwNW43M="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.arm64.zip",
|
||||
"hash": "sha256-CsEzoNseWllbNtN5mOYVCPvTPlm60fd7eSXuTpxbRx8="
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.arm64.zip",
|
||||
"hash": "sha256-QbQWDYkk+XnJReqx+Kj3hvGSDM7ACjDEWVFKd34hZkw="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.0/gauge-java-0.11.0-linux.x86_64.zip",
|
||||
"hash": "sha256-zig+Wq6uyBl8fKfjcpKCRFtHBZ/xFeDaUrUqvx1ails="
|
||||
"url": "https://github.com/getgauge/gauge-java/releases/download/v0.11.1/gauge-java-0.11.1-linux.x86_64.zip",
|
||||
"hash": "sha256-Ikt8rE8tehLXtWa4CjU6tWiBvOVoDpds8Jgy8QwW6lY="
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "linuxkit";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxkit";
|
||||
repo = "linuxkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Od6ij4RUWWNN3pm6Yt8W7LkeHnrusikJi2pXw6axbhU=";
|
||||
sha256 = "sha256-M/M4m/vsvvtSDnNNy8p6x+xpv1QmVzyfPRf/BNBX7zA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -35,13 +35,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chiaki-ng";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "streetpea";
|
||||
repo = "chiaki-ng";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew=";
|
||||
hash = "sha256-7+AixZu74y1V+rUauVswPzuWX2x6n3MJoM2A2w4zyuI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ buildGo121Module, fetchFromGitHub, lib }:
|
||||
{ buildGo122Module, fetchFromGitHub, lib }:
|
||||
|
||||
let
|
||||
generic = { subPackages, pname, postInstall ? "", mainProgram }:
|
||||
buildGo121Module rec {
|
||||
buildGo122Module rec {
|
||||
inherit pname;
|
||||
version = "6.11.0";
|
||||
shortRev = "9587df6"; # for internal version info
|
||||
|
||||
@ -55,5 +55,8 @@ buildGoModule rec {
|
||||
homepage = "https://zincsearch-docs.zinc.dev/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
# Doesn't build with Go version later v1.21 (which is EOL).
|
||||
# Upstream issue: https://github.com/zincsearch/zincsearch/issues/975
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
protobufc,
|
||||
libiconv,
|
||||
libxslt,
|
||||
docbook_xml_dtd_45,
|
||||
docbook5,
|
||||
cunit,
|
||||
pcre2,
|
||||
nixosTests,
|
||||
@ -28,7 +28,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postgis";
|
||||
version = "3.4.3";
|
||||
version = "3.5.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
|
||||
hash = "sha256-+N7VBdrrj1dlnaK55Xf/ceGDqqCUcI0u7OLFbZM2H2I=";
|
||||
hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis"
|
||||
substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \
|
||||
--replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql"
|
||||
substituteInPlace doc/postgis-out.xml --replace-fail "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
|
||||
substituteInPlace doc/postgis-out.xml --replace-fail "http://docbook.org/xml/5.0/dtd/docbook.dtd" "${docbook5}/xml/dtd/docbook/docbookx.dtd"
|
||||
# The test suite hardcodes it to use /tmp.
|
||||
export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg"
|
||||
'';
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "Tautulli";
|
||||
version = "2.14.4";
|
||||
version = "2.14.5";
|
||||
format = "other";
|
||||
|
||||
pythonPath = [ setuptools ];
|
||||
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
||||
owner = "Tautulli";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-IV5ZyVuZvr09wQ8SgcHiTBp916B2ZPQvrg9+O8H3xsk=";
|
||||
sha256 = "sha256-Xb8sby56U6Tc+OlxN7yKdhGGxrkmn6VfSPBhc1/YH24=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tealdeer";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbrgn";
|
||||
repo = "tealdeer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zQzYukhruVUVP1v76/5522ag7wjN9QoE9BtfMNYQ7UY=";
|
||||
hash = "sha256-7Wavhl5irQU9OV7+dslrIQEAcsaqJZ/jWmxaCyTBsEs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk=";
|
||||
cargoHash = "sha256-WCbpwvCXm54/Cv+TscaqseWzTUd8V1DxmS30fUZZTwI=";
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
|
||||
|
||||
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Very fast implementation of tldr in Rust";
|
||||
homepage = "https://github.com/dbrgn/tealdeer";
|
||||
maintainers = with maintainers; [ davidak newam ];
|
||||
maintainers = with maintainers; [ davidak newam mfrw ];
|
||||
license = with licenses; [ asl20 mit ];
|
||||
mainProgram = "tldr";
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, buildGo121Module
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
, pythonPackages
|
||||
@ -37,7 +37,7 @@ let
|
||||
cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"];
|
||||
};
|
||||
|
||||
in buildGo121Module rec {
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
inherit src version;
|
||||
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wTtHdPrGTzDSqkgKMROs772y3mc0X2jMguDZOAL6Ypw=";
|
||||
hash = "sha256-+UZ1o9rkbk/RnyU2Vzzs7uIm+texl5kGa+qt88x4zuk=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -28,7 +28,7 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-7HaDsLZsO7QIFiUBE4kH1av97EE+zwphPRusFfpMxUc=";
|
||||
vendorHash = "sha256-E1QHLh2gg5RZ7+tl7eJNR2FmtfVI6rwI6qLD7tio18c=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/cosign"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "boxes";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ascii-boxes";
|
||||
repo = "boxes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/gc/5vDflmEwOtQbtLwRcchyr22rLQcWqs5GrwRxY70=";
|
||||
hash = "sha256-dvhb5KWBQt7g4n0ZTQMcJQljIfavV3g8i+P3PWB6Gwk=";
|
||||
};
|
||||
|
||||
# Building instructions:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, buildGo123Module
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, git
|
||||
@ -7,18 +7,18 @@
|
||||
, d2
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo123Module rec {
|
||||
pname = "d2";
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SAejVwqTa/yV1pAIltAkX25KxITfkbzP9SGcLQdPUCg=";
|
||||
hash = "sha256-HD59q4GFrkjLvQQdYGA7ISwXJztweRxoV5AWbHinTx8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aoc8KSznkWJpn0Ye7FUOH5sNQ4fslIGJhIaQdGrwcqQ=";
|
||||
vendorHash = "sha256-HcWyhQFRI+dvOhUrVaL9U5PvL/CDBpaOYPXSkYzIYf4=";
|
||||
|
||||
excludedPackages = [ "./e2etests" ];
|
||||
|
||||
@ -48,7 +48,9 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern diagram scripting language that turns text to diagrams";
|
||||
mainProgram = "d2";
|
||||
homepage = "https://d2lang.com";
|
||||
changelog = "https://github.com/terrastruct/d2/releases/tag/v${version}";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ dit7ya kashw2 ];
|
||||
};
|
||||
|
||||
@ -14133,7 +14133,7 @@ with pkgs;
|
||||
zip = callPackage ../tools/archivers/zip { };
|
||||
|
||||
zincsearch = callPackage ../servers/search/zincsearch {
|
||||
buildGoModule = buildGo121Module;
|
||||
buildGoModule = buildGo122Module;
|
||||
};
|
||||
|
||||
zkfuse = callPackage ../tools/filesystems/zkfuse { };
|
||||
@ -14494,7 +14494,7 @@ with pkgs;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
inherit (coqPackages_8_19) compcert;
|
||||
inherit (coqPackages) compcert;
|
||||
|
||||
computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
|
||||
computecpp = wrapCCWith rec {
|
||||
@ -23950,17 +23950,6 @@ with pkgs;
|
||||
buildGoModule = buildGo123Module;
|
||||
buildGoPackage = buildGo123Package;
|
||||
|
||||
# requires a newer Apple SDK
|
||||
go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
|
||||
};
|
||||
buildGo121Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {
|
||||
go = buildPackages.go_1_21;
|
||||
};
|
||||
buildGo121Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {
|
||||
go = buildPackages.go_1_21;
|
||||
};
|
||||
|
||||
# requires a newer Apple SDK
|
||||
go_1_22 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.22.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
|
||||
@ -34758,16 +34747,7 @@ with pkgs;
|
||||
|
||||
chiaki = libsForQt5.callPackage ../games/chiaki { };
|
||||
|
||||
chiaki-ng = kdePackages.callPackage ../games/chiaki-ng {
|
||||
libplacebo = libplacebo.overrideAttrs (old: {
|
||||
version = "6.338.2-unstable-2024-01-29";
|
||||
src = old.src.override {
|
||||
# broken with 7.349.0 -- pinning to rev used by upstream https://github.com/streetpea/chiaki-ng/blob/96d535db41bb9c3b37fbffcf2402d51e891ff960/scripts/build-libplacebo.sh#L9
|
||||
rev = "c320f61e601caef2be081ce61138e5d51c1be21d";
|
||||
hash = "sha256-ZlKYgWz/Rkp4IPt6cJ+KNnzBB2s8jGZEamSAOIGyDuE=";
|
||||
};
|
||||
});
|
||||
};
|
||||
chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
|
||||
|
||||
clonehero = callPackage ../games/clonehero { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user