Skip to content

Commit

Permalink
manual flake update, fix some license stuff (#1511)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpetrucciani authored Mar 24, 2024
1 parent 98d83ee commit 874c4dc
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 71 deletions.
1 change: 1 addition & 0 deletions .github/styles/config/vocabularies/Code/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
(?i)oncall
(?i)ops
(?i)pagerduty
(?i)passcode
(?i)pingdom
(?i)pkgs
(?i)pocketbase
Expand Down
30 changes: 15 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkgs/ai/koboldcpp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ llvmPackages_14.stdenv.mkDerivation rec {
description = "A simple one-file way to run various GGML models with KoboldAI's UI";
homepage = "https://github.com/LostRuins/koboldcpp";
mainProgram = "koboldcpp";
license = licenses.agpl3;
license = licenses.agpl3Only;
maintainers = with maintainers; [ jpetrucciani ];
};
}
8 changes: 8 additions & 0 deletions pkgs/misc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@ This is a catch-all directory, for anything that doesn't fit nicely into other d

### [havn.nix](./havn.nix)

A fast configurable port scanner with reasonable defaults

### [horcrux.nix](./horcrux.nix)

Split your file into encrypted fragments so that you don't need to remember a passcode

### [ladder.nix](./ladder.nix)

Alternative to 12ft.io. Bypass paywalls with a proxy ladder and remove CORS headers from any URL

### [soulmsg.nix](./soulmsg.nix)

dark souls-esque message generator
52 changes: 0 additions & 52 deletions pkgs/misc/aoede.nix

This file was deleted.

8 changes: 5 additions & 3 deletions pkgs/misc/havn.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# A fast configurable port scanner with reasonable defaults
{ lib, fetchFromGitHub, rustPlatform }:
let
pname = "havn";
version = "0.1.0";
version = "0.1.8";
in
rustPlatform.buildRustPackage rec {
inherit pname version;
Expand All @@ -10,17 +11,18 @@ rustPlatform.buildRustPackage rec {
owner = "mrjackwills";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-zuqYYLmZOTs9MmowEz3J3og8Uu3ibbsRyuQBE9e+A5I=";
sha256 = "sha256-HAJ4gPS2ubi7Qu+XUh9Z2pNGm3G0NOl3k8GQtMox0MU=";
};

cargoHash = "sha256-5OVmtweweRaUuFjWhy60OrdtxnS7hqTnIgSO/NDxR2s=";
cargoHash = "sha256-ueXkZu58YJ5pktHwWIlwtWo4njGHlKXImLyE4eRoSEE=";

checkFlags = [
# these tests attempt to bind to local ports
"--skip=scanner::tests::test_scanner_1000_80_443"
"--skip=scanner::tests::test_scanner_1000_empty"
"--skip=scanner::tests::test_scanner_all_80"
"--skip=scanner::tests::test_scanner_port_80"
"--skip=terminal::print::tests::test_terminal_monochrome_false"
];

meta = with lib; {
Expand Down
1 change: 1 addition & 0 deletions pkgs/misc/horcrux.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Split your file into encrypted fragments so that you don't need to remember a passcode
{ lib, buildGo122Module, fetchFromGitHub }:
buildGo122Module rec {
pname = "horcrux";
Expand Down
1 change: 1 addition & 0 deletions pkgs/misc/ladder.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Alternative to 12ft.io. Bypass paywalls with a proxy ladder and remove CORS headers from any URL
{ lib
, buildGoModule
, fetchFromGitHub
Expand Down
1 change: 1 addition & 0 deletions pkgs/misc/soulmsg.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# dark souls-esque message generator
{ lib, buildGo122Module, fetchFromGitHub, ... }:
buildGo122Module rec {
pname = "soulmsg";
Expand Down

0 comments on commit 874c4dc

Please sign in to comment.