Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -164,6 +164,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- [go-camo](https://github.com/cactus/go-camo), a secure image proxy server. Available as [services.go-camo](#opt-services.go-camo.enable).
|
||||
|
||||
- [CommaFeed](https://github.com/Athou/commafeed), a Google Reader inspired self-hosted RSS reader. Available as [services.commafeed](#opt-services.commafeed.enable).
|
||||
|
||||
- [Monado](https://monado.freedesktop.org/), an open source XR runtime. Available as [services.monado](#opt-services.monado.enable).
|
||||
|
||||
- [intel-gpu-tools](https://drm.pages.freedesktop.org/igt-gpu-tools), tools for development and testing of the Intel DRM driver. Available as [hardware.intel-gpu-tools](#opt-hardware.intel-gpu-tools.enable).
|
||||
|
||||
@@ -1341,6 +1341,7 @@
|
||||
./services/web-apps/chatgpt-retrieval-plugin.nix
|
||||
./services/web-apps/cloudlog.nix
|
||||
./services/web-apps/code-server.nix
|
||||
./services/web-apps/commafeed.nix
|
||||
./services/web-apps/convos.nix
|
||||
./services/web-apps/crabfit.nix
|
||||
./services/web-apps/davis.nix
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.commafeed;
|
||||
in
|
||||
{
|
||||
options.services.commafeed = {
|
||||
enable = lib.mkEnableOption "CommaFeed";
|
||||
|
||||
package = lib.mkPackageOption pkgs "commafeed" { };
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "User under which CommaFeed runs.";
|
||||
default = "commafeed";
|
||||
};
|
||||
|
||||
group = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Group under which CommaFeed runs.";
|
||||
default = "commafeed";
|
||||
};
|
||||
|
||||
stateDir = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Directory holding all state for CommaFeed to run.";
|
||||
default = "/var/lib/commafeed";
|
||||
};
|
||||
|
||||
environment = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.oneOf [
|
||||
lib.types.bool
|
||||
lib.types.int
|
||||
lib.types.str
|
||||
]
|
||||
);
|
||||
description = ''
|
||||
Extra environment variables passed to CommaFeed, refer to
|
||||
<https://github.com/Athou/commafeed/blob/master/commafeed-server/config.yml.example>
|
||||
for supported values. The default user is `admin` and the default password is `admin`.
|
||||
Correct configuration for H2 database is already provided.
|
||||
'';
|
||||
default = { };
|
||||
example = {
|
||||
CF_SERVER_APPLICATIONCONNECTORS_0_TYPE = "http";
|
||||
CF_SERVER_APPLICATIONCONNECTORS_0_PORT = 9090;
|
||||
};
|
||||
};
|
||||
|
||||
environmentFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
description = ''
|
||||
Environment file as defined in {manpage}`systemd.exec(5)`.
|
||||
'';
|
||||
default = null;
|
||||
example = "/var/lib/commafeed/commafeed.env";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.commafeed = {
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = lib.mapAttrs (
|
||||
_: v: if lib.isBool v then lib.boolToString v else toString v
|
||||
) cfg.environment;
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} server ${cfg.package}/share/config.yml";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
StateDirectory = baseNameOf cfg.stateDir;
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
# Hardening
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DevicePolicy = "closed";
|
||||
DynamicUser = true;
|
||||
LockPersonality = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
UMask = "0077";
|
||||
} // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; };
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = [ lib.maintainers.raroh73 ];
|
||||
}
|
||||
@@ -205,6 +205,7 @@ in {
|
||||
code-server = handleTest ./code-server.nix {};
|
||||
coder = handleTest ./coder.nix {};
|
||||
collectd = handleTest ./collectd.nix {};
|
||||
commafeed = handleTest ./commafeed.nix {};
|
||||
connman = handleTest ./connman.nix {};
|
||||
consul = handleTest ./consul.nix {};
|
||||
consul-template = handleTest ./consul-template.nix {};
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import ./make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "commafeed";
|
||||
|
||||
nodes.server = {
|
||||
services.commafeed = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
server.start()
|
||||
server.wait_for_unit("commafeed.service")
|
||||
server.wait_for_open_port(8082)
|
||||
server.succeed("curl --fail --silent http://localhost:8082")
|
||||
'';
|
||||
|
||||
meta.maintainers = [ lib.maintainers.raroh73 ];
|
||||
}
|
||||
)
|
||||
@@ -89,6 +89,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
''
|
||||
catester.start()
|
||||
caserver.wait_for_unit("step-ca.service")
|
||||
caserver.succeed("journalctl -o cat -u step-ca.service | grep '${pkgs.step-ca.version}'")
|
||||
|
||||
caclient.wait_for_unit("acme-finished-caclient.target")
|
||||
catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"")
|
||||
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opustags";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fmang";
|
||||
repo = "opustags";
|
||||
rev = version;
|
||||
sha256 = "sha256-2t6fhA1s1sKpHTmaMtK+DZ8xLpS6ntq33b4ycuMc8x8=";
|
||||
sha256 = "sha256-0lo+4VMYXGwXUuRxU1xZRxzlUQ4o4n/CDHXDM27FK44=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -2646,6 +2646,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
};
|
||||
|
||||
cornelis = buildVimPlugin {
|
||||
pname = "cornelis";
|
||||
version = "2024-04-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "isovector";
|
||||
repo = "cornelis";
|
||||
rev = "c97b4817034a927dcadb22294cf97a88087a935f";
|
||||
sha256 = "03wkq7jly9syv7kqsf66hdq8p7fqk6a240azcys9fsak797nbs1a";
|
||||
};
|
||||
meta.homepage = "https://github.com/isovector/cornelis/";
|
||||
};
|
||||
|
||||
cosco-vim = buildVimPlugin {
|
||||
pname = "cosco.vim";
|
||||
version = "2018-08-07";
|
||||
|
||||
@@ -63,6 +63,8 @@
|
||||
, # command-t dependencies
|
||||
getconf
|
||||
, ruby
|
||||
, # cornelis dependencies
|
||||
cornelis
|
||||
, # cpsm dependencies
|
||||
boost
|
||||
, cmake
|
||||
@@ -466,6 +468,17 @@
|
||||
patches = [ ./patches/coq_nvim/emulate-venv.patch ];
|
||||
};
|
||||
|
||||
cornelis = super.cornelis.overrideAttrs {
|
||||
dependencies = with self; [ vim-textobj-user ];
|
||||
opt = with self; [ vim-which-key ];
|
||||
# Unconditionally use the cornelis binary provided by the top-level package:
|
||||
patches = [ ./patches/cornelis/0001-Unconditionally-use-global-binary.patch ];
|
||||
postInstall = ''
|
||||
substituteInPlace $out/ftplugin/agda.vim \
|
||||
--subst-var-by CORNELIS "${lib.getBin cornelis}/bin/cornelis"
|
||||
'';
|
||||
};
|
||||
|
||||
cpsm = super.cpsm.overrideAttrs {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
From f8e993846551bda77a34a77aad7ad6dcc45b66a7 Mon Sep 17 00:00:00 2001
|
||||
From: Philipp Joram <nixpgks@phijor.me>
|
||||
Date: Tue, 16 Apr 2024 12:48:42 +0300
|
||||
Subject: [PATCH] Unconditionally use global binary
|
||||
|
||||
---
|
||||
ftplugin/agda.vim | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/ftplugin/agda.vim b/ftplugin/agda.vim
|
||||
index c7dd9d0..6b4aba3 100644
|
||||
--- a/ftplugin/agda.vim
|
||||
+++ b/ftplugin/agda.vim
|
||||
@@ -11,13 +11,7 @@ if exists("b:cornelis_ftplugin")
|
||||
endif
|
||||
let b:cornelis_ftplugin = 1
|
||||
|
||||
-if exists("g:cornelis_use_global_binary")
|
||||
- call remote#host#Register('cornelis', '*', rpcstart('cornelis', []))
|
||||
-else
|
||||
- call nvimhs#start(expand('<sfile>:p:h:h'), 'cornelis', ['-v', 'DEBUG', '-l', '/tmp/cornelis.log'])
|
||||
-endif
|
||||
-
|
||||
-nnoremap <F5> :call nvimhs#compileAndRestart('cornelis')<CR>
|
||||
+call remote#host#Register('cornelis', '*', rpcstart('@CORNELIS@', []))
|
||||
|
||||
runtime agda-input.vim
|
||||
runtime agda-matchpairs.vim
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -220,6 +220,7 @@ https://github.com/ms-jpq/coq.artifacts/,HEAD,
|
||||
https://github.com/ms-jpq/coq.thirdparty/,HEAD,
|
||||
https://github.com/jvoorhis/coq.vim/,,
|
||||
https://github.com/ms-jpq/coq_nvim/,,
|
||||
https://github.com/isovector/cornelis/,HEAD,
|
||||
https://github.com/lfilho/cosco.vim/,,
|
||||
https://github.com/nixprime/cpsm/,,
|
||||
https://github.com/saecki/crates.nvim/,,
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
python310Packages.buildPythonApplication rec {
|
||||
pname = "nwg-displays";
|
||||
version = "0.3.18";
|
||||
version = "0.3.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-displays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wf72x3lXNAJ6Y4zJmYgwJrL1gWJBvTYUcXasT5zlXCM=";
|
||||
hash = "sha256-pZelKuTClRELZT80r44FxocdW+KRARD027ZV18XTTss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "transifex-cli";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "transifex";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k26z/eFXjNijoth/hWXPfCv4/z6row9DRc9SEtnnX1o=";
|
||||
sha256 = "sha256-SVXrrpkz2veA1L5p88iGQxHAUtySiYge0ffY2HyVCr0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU=";
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "twitch-tui";
|
||||
version = "2.6.8";
|
||||
version = "2.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xithrius";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tak9CPqDVGTfQAjNLhPPvYgP4lUV5g1vPziWbRtqOA0=";
|
||||
hash = "sha256-c5wDneX7p3kOhARaDISHFdPpo4Bs1KbRdShp2cjI6wQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SNSFUhm2zFew/oYCoRQXTGEhwmvgM8GX5afPRoltmV0=";
|
||||
cargoHash = "sha256-4kz8s5cQDSPZEyHB7+A5q+PrvSr/jAyjfLw+uhThFxQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
|
||||
"--disable-zstd"
|
||||
] ++ lib.optionals (!enableXXHash) [
|
||||
"--disable-xxhash"
|
||||
] ++ lib.optionals (!enableLZ4) [
|
||||
"--disable-lz4"
|
||||
] ++ lib.optionals (!enableOpenSSL) [
|
||||
"--disable-openssl"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "0-unstable-2024-05-04";
|
||||
version = "0-unstable-2024-05-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "f29512886514410fa68d2debdb9389a8f81f3aaa";
|
||||
hash = "sha256-Uq8G2lSVTj1JmiLnn5FZd/WKS+wjZxoaliOyghVZg34=";
|
||||
rev = "dfbea81adc25e109dfe5482cc09508f612aaa84d";
|
||||
hash = "sha256-Hh42q7soCCXY7AMTH3bLMlUJ72y3QOyC/1nFUQPMFaM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "0-unstable-2024-05-12";
|
||||
version = "0-unstable-2024-05-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "978b3bd582a90c8e82079f2e4e4a3a5038cbbe08";
|
||||
hash = "sha256-DoGX8nUcWcioTq8ymB+HLsCnt9V6HTKSX4Zs2CQz78Q=";
|
||||
rev = "e5fc4a44797549da9d8994203547da63002b3700";
|
||||
hash = "sha256-pX8rRIrOq0fQvzVrvAh47ZBzdkS6ZKuXTQ9joa/XJgg=";
|
||||
};
|
||||
|
||||
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "commitizen";
|
||||
version = "3.25.0";
|
||||
version = "3.26.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "commitizen-tools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9vaQO0KBL4RgWS8mNSZlnpm1qH+l5TjCa5JndQ1Q36Q=";
|
||||
hash = "sha256-tj+zH94IiFqkmkIqyNmgQgQNjvqWgCviLzfGrrCHX1k=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
jre,
|
||||
maven,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
writeText,
|
||||
}:
|
||||
let
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Athou";
|
||||
repo = "commafeed";
|
||||
rev = version;
|
||||
hash = "sha256-y0gTmtlDg7sdunG1ne/3WkFx2KQkTGRlfYpXBHFFh2o=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
inherit version src;
|
||||
|
||||
pname = "commafeed-frontend";
|
||||
|
||||
sourceRoot = "${src.name}/commafeed-client";
|
||||
|
||||
npmDepsHash = "sha256-fye7MPWXUeFCMgcnesspd1giGG/ZldiOv00fjtXZSb4=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist/ $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
gitProperties = writeText "git.properties" ''
|
||||
git.branch = none
|
||||
git.build.time = 1970-01-01T00:00:00+0000
|
||||
git.build.version = ${version}
|
||||
git.commit.id = none
|
||||
git.commit.id.abbrev = none
|
||||
'';
|
||||
in
|
||||
maven.buildMavenPackage {
|
||||
inherit version src;
|
||||
|
||||
pname = "commafeed";
|
||||
|
||||
mvnHash = "sha256-YnEDJf4GeyiXxOh8tZZTZdLOJrisG6lmShXU97ueGNE=";
|
||||
|
||||
mvnParameters = lib.escapeShellArgs [
|
||||
"-Dskip.installnodenpm"
|
||||
"-Dskip.npm"
|
||||
"-Dspotless.check.skip"
|
||||
"-Dmaven.gitcommitid.skip"
|
||||
"-DskipTests"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
ln -sf "${frontend}" commafeed-client/dist
|
||||
|
||||
cp ${gitProperties} commafeed-server/src/main/resources/git.properties
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share
|
||||
install -Dm644 commafeed-server/target/commafeed.jar $out/share/commafeed.jar
|
||||
install -Dm644 commafeed-server/config.yml.example $out/share/config.yml
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/commafeed \
|
||||
--add-flags "-jar $out/share/commafeed.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/config.yml \
|
||||
--replace-fail 'url: jdbc:h2:/commafeed/data/db;DEFRAG_ALWAYS=TRUE' \
|
||||
'url: jdbc:h2:./database/db;DEFRAG_ALWAYS=TRUE'
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.commafeed;
|
||||
|
||||
meta = {
|
||||
description = "Google Reader inspired self-hosted RSS reader";
|
||||
homepage = "https://github.com/Athou/commafeed";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "commafeed";
|
||||
maintainers = [ lib.maintainers.raroh73 ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
{
|
||||
lib,
|
||||
haskell,
|
||||
haskellPackages,
|
||||
|
||||
# Test dependencies
|
||||
cornelis,
|
||||
runCommand,
|
||||
}:
|
||||
let
|
||||
inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
|
||||
overrides = {
|
||||
description = "agda-mode for Neovim";
|
||||
|
||||
passthru = {
|
||||
tests = runCommand "cornelis-tests" { nativeBuildInputs = [ cornelis ]; } ''
|
||||
cornelis --help > $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.pipe haskellPackages.cornelis [
|
||||
(overrideCabal overrides)
|
||||
|
||||
# Reduce closure size
|
||||
justStaticExecutables
|
||||
]
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nezha-agent";
|
||||
version = "0.16.7";
|
||||
version = "0.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SKPDNYbtN93GVOlghYS69iHORDUshN47lAZ9DDoX0jM=";
|
||||
hash = "sha256-s3l6sI+gQcy5Qxjzg+l9t9e8WWYppiMljX7o1rSXFIs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kqu3+hO0juxI5qbczVFg0GF+pljmePFbKd59a14U7Pg=";
|
||||
vendorHash = "sha256-Qx0XAlWLDqN1CZTmf1yVc8yFmz9/5bz/HVqN/korJzE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
Generated
+376
-302
File diff suppressed because it is too large
Load Diff
@@ -13,26 +13,25 @@
|
||||
, mesa
|
||||
, fontconfig
|
||||
, libglvnd
|
||||
, libclang
|
||||
, autoPatchelfHook
|
||||
, clang
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "niri";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YaLTeR";
|
||||
repo = "niri";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YuYowUw5ecPa78bhT72zY2b99wn68mO3vVkop8hnb8M=";
|
||||
hash = "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"smithay-0.3.0" = "sha256-1ANERwRG7Uwe1gSm6zQnEMQlpRrGSFP8mp6JItzjz0k=";
|
||||
"smithay-0.3.0" = "sha256-UzX5pws8yxJhXdKIDzu6uw+PlVLRS9U9ZAfQovKv0w0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "5.3.1";
|
||||
version = "5.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-8fftHQpv2GZhi3ZDXYUG7uAiWuuX79dntGAbKIvv4Kc=";
|
||||
hash = "sha256-9FLoQxh9HNWmZguczfC3CkXIt7oMfCFhfen2y+Tfac4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "omnictl";
|
||||
version = "0.35.0";
|
||||
version = "0.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "omni";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y4kWIj7DDeUs521csW26w1K6esZMgvI4MQtgZAeOtlk=";
|
||||
hash = "sha256-cxD3oaGRpYqgraJpDtnjND5TBSdloACms57Be/gnTbo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BYKIAgWR+PDJbDJ72PS6TDvpZx7yRaDJzbq0/b/MIKs=";
|
||||
vendorHash = "sha256-gQUg0ynaySpBCrZWeZl0GdiB7mvHML58lmV6l7ABb5E=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -1,42 +1,66 @@
|
||||
{ lib, stdenv, fetchurl, unzip, makeWrapper
|
||||
, coreutils, gawk, which, gnugrep, findutils
|
||||
, jre
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
makeBinaryWrapper,
|
||||
coreutils,
|
||||
gawk,
|
||||
which,
|
||||
gnugrep,
|
||||
findutils,
|
||||
jre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openjump";
|
||||
version = "2.2.1";
|
||||
revision = "r5222%5B94156e5%5D";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/${version}/OpenJUMP-Portable-${version}-${revision}-PLUS.zip";
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip";
|
||||
hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI=";
|
||||
};
|
||||
|
||||
# TODO: build from source
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
mkdir -p $out/opt
|
||||
unzip $src -d $out/opt
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dir=$(echo $out/opt/OpenJUMP-*)
|
||||
|
||||
chmod +x "$dir/bin/oj_linux.sh"
|
||||
makeWrapper "$dir/bin/oj_linux.sh" $out/bin/OpenJump \
|
||||
--set JAVA_HOME ${jre} \
|
||||
--set PATH ${lib.makeBinPath [ coreutils gawk which gnugrep findutils ]}
|
||||
--set PATH ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
gawk
|
||||
which
|
||||
gnugrep
|
||||
findutils
|
||||
]
|
||||
}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source Geographic Information System (GIS) written in the Java programming language";
|
||||
homepage = "http://www.openjump.org/";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
license = lib.licenses.gpl2;
|
||||
mainProgram = "OpenJump";
|
||||
maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ];
|
||||
platforms = jre.meta.platforms;
|
||||
mainProgram = "OpenJump";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.35.1";
|
||||
version = "0.35.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ympqli1CHqS4iR76Rs9SFTVP4PxHsnFpZMDReg3+LhA=";
|
||||
hash = "sha256-2m6ktcSZWOuu4S3FI3kiPTRhS2+rRgI5M7BZ//9bb8M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-moabqZlj3vWkQo/yZEcwbvXuqrTswfSFaci/FEJzfnQ=";
|
||||
cargoHash = "sha256-JbuHuj0VG+3nRNEoVHoOdA66RWbWrIzDkwa7PsO3TJ0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "renode-dts2repl";
|
||||
version = "0-unstable-2024-05-09";
|
||||
version = "0-unstable-2024-05-16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antmicro";
|
||||
repo = "dts2repl";
|
||||
rev = "b95c930c2122e227bbacee42f35933a4c2d40771";
|
||||
hash = "sha256-Sax+ckln+R6ll/UPztESJEjO8dtq8THmi309CaFTv0I=";
|
||||
rev = "2eb930e6c9f6b5821e62ca568682a099a2aea99e";
|
||||
hash = "sha256-fMx3sbpxLDzNiDvqxEtqXvAKD8UWe7Du7JTOL1hVkk4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,21 +1,32 @@
|
||||
{
|
||||
lib
|
||||
, php
|
||||
, fetchFromGitHub
|
||||
lib,
|
||||
php82,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
php82.buildComposerProject (finalAttrs: {
|
||||
pname = "robo";
|
||||
version = "4.0.6";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "consolidation";
|
||||
repo = "robo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-rpCs24Q15XM4BdW1+IfysFR/8/ZU4o5b4MyJL48uDaU=";
|
||||
hash = "sha256-tibG2sR5CsRnUjZEvOewX/fyMuAS1kgKjYbrkk+f0BI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ul8XjH0Nav37UVpNQslOkF2bkiyqUAEZiIbcSW2tGkQ=";
|
||||
patches = [
|
||||
# Fix the version number
|
||||
# Most likely to remove at the next bump update
|
||||
# See https://github.com/drupol/robo/pull/1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/drupol/robo/commit/c3cd001525c1adb5980a3a18a5561a0a5bbe1f50.patch";
|
||||
hash = "sha256-iMdZx+Bldmf1IS6Ypoet7GSsE6J9ZnE0HTskznkyEKM=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-RRnHv6sOYm8fYhY3Q6m5sFDflFXd9b9LPcAqk/D1jdE=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "twitch-dl";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "twitch-dl";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0uOOc3ANXleQlENB+gdWheafBiOOcyZsFvYj7r+WMCY=";
|
||||
hash = "sha256-ixkIDJbysa3TOJiNmAG2SuJwCv5MaX6nCtUnS4901rg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -20,8 +20,8 @@ let
|
||||
vc_intrinsics_src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "vc-intrinsics";
|
||||
rev = "v0.16.0";
|
||||
hash = "sha256-d197m80vSICdv4VKnyqdy3flzbKLKmB8jroY2difA7o=";
|
||||
rev = "v0.18.0";
|
||||
hash = "sha256-F2GR3TDUUiygEhdQN+PsMT/CIYBATMQX5wkvwrziS2E=";
|
||||
};
|
||||
|
||||
inherit (llvmPackages_14) lld llvm;
|
||||
@@ -31,7 +31,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "1.0.16238.4";
|
||||
version = "1.0.16695.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
|
||||
@@ -3093,6 +3093,10 @@ self: super: {
|
||||
# https://github.com/isovector/type-errors/issues/9
|
||||
type-errors = dontCheck super.type-errors;
|
||||
|
||||
# 2024-05-15: Hackage distribution is missing files needed for tests
|
||||
# https://github.com/isovector/cornelis/issues/150
|
||||
cornelis = dontCheck super.cornelis;
|
||||
|
||||
cabal-gild = super.cabal-gild.overrideScope (self: super: {
|
||||
tasty = super.tasty_1_5;
|
||||
tasty-quickcheck = super.tasty-quickcheck_0_10_3;
|
||||
|
||||
@@ -1003,7 +1003,6 @@ broken-packages:
|
||||
- core-haskell # failure in job https://hydra.nixos.org/build/233222588 at 2023-09-02
|
||||
- corenlp-types # failure in job https://hydra.nixos.org/build/243808366 at 2024-01-01
|
||||
- core-warn # failure in job https://hydra.nixos.org/build/233204404 at 2023-09-02
|
||||
- cornelis # failure in job https://hydra.nixos.org/build/259604220 at 2024-05-15
|
||||
- Coroutine # failure in job https://hydra.nixos.org/build/233211213 at 2023-09-02
|
||||
- coroutine-object # failure in job https://hydra.nixos.org/build/233220413 at 2023-09-02
|
||||
- couchdb-conduit # failure in job https://hydra.nixos.org/build/233227244 at 2023-09-02
|
||||
|
||||
@@ -254,6 +254,8 @@ package-maintainers:
|
||||
- Unique
|
||||
libjared:
|
||||
- sensei
|
||||
malo:
|
||||
- cornelis
|
||||
maralorn:
|
||||
- bluefin
|
||||
- cabal-fmt
|
||||
@@ -322,6 +324,8 @@ package-maintainers:
|
||||
- titlecase
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
phijor:
|
||||
- cornelis
|
||||
poscat:
|
||||
- hinit
|
||||
psibi:
|
||||
|
||||
+1
-2
@@ -75510,9 +75510,8 @@ self: {
|
||||
vector
|
||||
];
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "cornelis";
|
||||
broken = true;
|
||||
maintainers = [ lib.maintainers.malo lib.maintainers.phijor ];
|
||||
}) {};
|
||||
|
||||
"coroutine-enumerator" = callPackage
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-zf6u7fGMMx+DeXcS4SxyK3aQ53jnXzQ8YPrJ89vG65Y=";
|
||||
hash = "sha256-CMIWxxryDDA38uyGl3SIooliU0ElAY1iAqnexn2Uq58=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Uv2BoE/hTK59uxHsdm4M5hfozDw4LwwZH4MHd+vN60Y=";
|
||||
vendorHash = "sha256-CSkwBBV6b2inpQu4TKBR23Du11mzr3rV6GtprzHAOgQ=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,40 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, nix-update-script
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "character-encoding-utils";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "character_encoding_utils";
|
||||
inherit version;
|
||||
hash = "sha256-cUggyNz5xphDF+7dSrx3vr3v3R8ISryHj9accMJfDbg=";
|
||||
hash = "sha256-UXX4L/x7fP37ZEFDCPc0KRNyx47xvwY0Jz+lfxzUulg=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
pythonImportsCheck = [ "character_encoding_utils" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/TakWolf/character-encoding-utils";
|
||||
description = "Some character encoding utils";
|
||||
platforms = lib.platforms.all;
|
||||
homepage = "https://github.com/TakWolf/character-encoding-utils";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ h7x4 ];
|
||||
};
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cliff";
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LzjOi9HqSVjWbxWwZqxH5l1h9gC5MZuSHhLp6cvNmdA=";
|
||||
hash = "sha256-bKRfjfUZu8ByLGEEnee35EKkZfp/P1Urltc1+ib9WyY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gflanguages";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kaJZ0STN2U/4vQ7g5VbpPGv64czryK8jXmIJ97bkItA=";
|
||||
hash = "sha256-mlRNzrAgeEt1/VbQEXWIxCD9NkULMOnkFsALO5H+1SY=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "heudiconv";
|
||||
version = "1.1.0";
|
||||
version = "1.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zRLRdP3LpytHCTrehhPYMmJnss5v6ojjkIPuB8fKR5w=";
|
||||
hash = "sha256-ktw/XrvA5G+DunjEB8LeQuQnjs6zQOKsZ+RGpzDZ5DQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pcffont";
|
||||
version = "0.0.11";
|
||||
version = "0.0.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TakWolf";
|
||||
repo = "pcffont";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gu9niWxYTw3rcA++z8B+MdKp5XaqAGjmvd+PdSDosfg=";
|
||||
hash = "sha256-DbPcE2Bx+V90s7P3Gq+Uz3iQNidwbNlp7zln8ykL7Sg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phe";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
# https://github.com/data61/python-paillier/issues/51
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "data61";
|
||||
repo = "python-paillier";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fsZ8x/K+8V4zyVgkci6XNAm89zQFWEbmRVp4jazFfVY=";
|
||||
hash = "sha256-P//4ZL4+2zcB5sWvujs2N0CHFz+EBLERWrPGLLHj6CY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools
|
||||
, tqdm
|
||||
, websocket-client
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
tqdm,
|
||||
websocket-client,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.15.12";
|
||||
version = "4.15.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,12 +20,10 @@ buildPythonPackage rec {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-i+Vg1SWxDKprZu+crf0iallaAIApDpidJ//2mivAn18=";
|
||||
hash = "sha256-i898cHYOSrzSreWBmW7W9QBUoyIDKwmt4k2wgutN3bw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
@@ -35,9 +34,7 @@ buildPythonPackage rec {
|
||||
# Tests require a running Plex instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"plexapi"
|
||||
];
|
||||
pythonImportsCheck = [ "plexapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for the Plex API";
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynws";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "MatthewFlamm";
|
||||
repo = "pynws";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KUCylHYng6mn2TWKf8C7k0IoerM22OIQ7pJMKi5SF3A=";
|
||||
hash = "sha256-gC5IOW5sejXigBKfxLst8MwU/IkqSQrMZhmd4eza++s=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvista";
|
||||
version = "0.43.7";
|
||||
version = "0.43.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-z/IO25hcHv1pimUecIIX5hZPYF2/1QkROqZ2D4Tk7DE=";
|
||||
hash = "sha256-ZAj0aIinaVet/zK8yF1LrB63hrb2dTmTROA8uNl0yug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stone";
|
||||
version = "3.3.3";
|
||||
version = "3.3.6";
|
||||
pyproject = true;
|
||||
|
||||
# distutils removal, https://github.com/dropbox/stone/issues/323
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "dropbox";
|
||||
repo = "stone";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-l86j2fd6x57bKt/TFGiyg+ZFjZFFCo43rE48MoPvXWc=";
|
||||
hash = "sha256-Og0hUUCCd9wRdHUhZBl62rDAunP2Bph5COsCw/T1kUA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moon";
|
||||
version = "1.24.4";
|
||||
version = "1.24.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LOUACki6uG8jDBI2eOO0C/tQrJ7L3aehwo+4pe9ONgo=";
|
||||
hash = "sha256-9ChvfyXo16wtIKqAHtmmU9veArCX+VtuaG0d6sxz8UE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kTLWWtAqoSTmVBHYJKMUsV8jtSYzgERkSErLRMmZI7Y=";
|
||||
cargoHash = "sha256-C3uLmPb8nZVu5McfhVjlhE46ehtcoUesx5dNzzY+wAU=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nexus";
|
||||
version = "3.52.0-01";
|
||||
version = "3.68.1-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz";
|
||||
hash = "sha256-+Hdmuy7WBtUIjEBZyLgE3a3+L/lANHiy1VRBJ2s686U=";
|
||||
hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-crev";
|
||||
version = "0.25.6";
|
||||
version = "0.25.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crev-dev";
|
||||
repo = "cargo-crev";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kMbbUXiU549JwblLzcP4X5rs6Qu8vaLKB5rnZSpKHKQ=";
|
||||
sha256 = "sha256-ZevtYJ1ibSs3an3m1KJNTTquz1w6UfTiFgd1mNHFHWE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gUHy8yXTiQd3/7IyVmiq0QqXKF4ZVhF+riryEj/w2NI=";
|
||||
cargoHash = "sha256-QHhfHm2fDFR5BpSnw1wzr3dfCWDTzWNDDdRtj2qOoKE=";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.75";
|
||||
version = "2.0.76";
|
||||
pname = "munin";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "munin-monitoring";
|
||||
repo = "munin";
|
||||
rev = version;
|
||||
sha256 = "sha256-fxjF2CV5SoUTirusGQBpbNu9MYKU5yx+DHS2h0NJoic=";
|
||||
sha256 = "sha256-9PfIzUObm3Nu2k2TFjbQ3cqIDkPz07ZUczEcfm3bpDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflare-exporter";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
owner = "lablabs";
|
||||
repo = pname;
|
||||
sha256 = "sha256-cmA+OdPsG9JTiYGzXeK8dEhZJPHFKgKDaDMszIVyzg0=";
|
||||
sha256 = "sha256-7cyHAN4VQWfWMdlFbZvHL38nIEeC1z/vpCDR5R2pOAw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c1drgbzoA5AlbB0K+E8kuJnyShgUg7spPQKAAwxCr6M=";
|
||||
|
||||
@@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.205";
|
||||
version = "3.0.206";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-fUInyAJKMvHZ13sWjqWr4KPge/hpeDSkJl69nnWJkPc=";
|
||||
sha256 = "sha256-xMDTZZCaTH2aru9bx1bmO5xqwH1dsUuBUZ1df7Re8+4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4jGwhcWANYUXuzFjXmFKzMVQXqFtPJt/y3IrjveRNYA=";
|
||||
vendorHash = "sha256-MnOqh3qAYAN2Lxt/RWWn4GgpdBFDojMbnzIsHx2pPSk=";
|
||||
|
||||
subPackages = [ "main" ];
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mcfly";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cantino";
|
||||
repo = "mcfly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vzGZzZy3VBntsmBcb+APEQTWoz4rsxWAiiInj+E6Xd0=";
|
||||
hash = "sha256-OoDfQze4t03PaLyoB0/0HtcsPK6Jy74OythuJG6Vy60=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-XASDPF21ZlVTLa0n5MAsm9FZz+ar9KRiPacsx0bX7OA=";
|
||||
cargoHash = "sha256-Y1W9QetWZAgcZdfJNH9Hg3i4NZoCpf7FIPOlaRJzBrQ=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cantino/mcfly";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdk-go";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk-team";
|
||||
repo = "CDK";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jgGOSlhlLO1MU1mHWZgw+ov4IrZwMo2GdG6L25ah9Z8=";
|
||||
hash = "sha256-0cg2o98BcE4H6EW/yAkJOJtIJXEq2cFG6pNaRPtQofo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aJN/d/BxmleRXKw6++k6e0Vb0Gs5zg1QfakviABYTog=";
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "11.3.1";
|
||||
version = "11.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LcU4U2mxNrLJyp/V5d8TDo9DAcRBb4aRK+aEKoMCsZ0=";
|
||||
hash = "sha256-j2cBoeUpxZV8NlC0D3e6bF533LVN0eIRqE7PSIWBGEw=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-z12/OKkrDru8jO4R1I/XfzGCBPHAD+KhJKv3dyyYCdw=";
|
||||
vendorHash = "sha256-kovSP+ru32vxve8tmeTRS1fsWTpyBTWhLp5iexKo0Fk=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ghauri";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "r0oth3x49";
|
||||
repo = "ghauri";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QO4/dkJU/uhP1AT1kIxDBIGBfLI1rOhOe/cHC8GwhkA=";
|
||||
hash = "sha256-zd+Uf2t8yBWi07+BJYYYQ+4fIissuBdXjj877ul4gAQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sherlock";
|
||||
version = "unstable-2024-05-12";
|
||||
version = "0-unstable-2024-05-15";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sherlock-project";
|
||||
repo = "sherlock";
|
||||
rev = "3e978d774b428dce6eed7afbb6606444e7a74924";
|
||||
hash = "sha256-wa32CSQ9+/PJPep84Tqtzmr6EjD1Bb3guZe5pTOZVnA=";
|
||||
rev = "0ecb496ae91bc36476e3e6800aa3928c5dcd82f8";
|
||||
hash = "sha256-CikQaQsiwKz0yEk3rA6hi570LIobEaxxgQ5I/B6OxWk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -24,6 +24,11 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
|
||||
Reference in New Issue
Block a user