Skip to content

Commit

Permalink
Merge branch 'NixOS:master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
thegarchivist authored Oct 29, 2024
2 parents b55c221 + 37fd70b commit 6e23eb0
Show file tree
Hide file tree
Showing 8 changed files with 507 additions and 354 deletions.
8 changes: 6 additions & 2 deletions pkgs/applications/audio/bambootracker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null;

stdenv.mkDerivation (finalAttrs: {
pname = "bambootracker";
version = "0.6.3";
version = "0.6.4";

src = fetchFromGitHub {
owner = "BambooTracker";
repo = "BambooTracker";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-rMYs2jixzoMGem9lxAjDMbFOMrnK8BLFjZIagdZk/Ok=";
hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g=";
};

postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") ''
Expand Down Expand Up @@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
qmakeFlags = [
"CONFIG+=system_rtaudio"
"CONFIG+=system_rtmidi"
] ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [
# Clang is extra-strict about some deprecations
# Latest Qt6 deprecated QCheckBox::stateChanged(int)
"CONFIG+=no_warnings_are_errors"
];

postConfigure = "make qmake_all";
Expand Down
42 changes: 42 additions & 0 deletions pkgs/by-name/gs/gsan/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
lib,
fetchFromGitHub,
python3,
}:

python3.pkgs.buildPythonApplication rec {
pname = "gsan";
version = "5.0.0";
pyproject = true;

src = fetchFromGitHub {
owner = "franccesco";
repo = "getaltname";
rev = "refs/tags/v${version}";
hash = "sha256-Os/NappuvdadGqCouF5vhvPhRnu1SLpii+Esq0C1j48=";
};

build-system = with python3.pkgs; [ setuptools ];

dependencies = with python3.pkgs; [
cryptography
pyasn1
pyopenssl
rich
typer
];

# Project has no tests
doCheck = false;

pythonImportsCheck = [ "gsan" ];

meta = {
description = "Tool to extract subdomains from SSL certificates in HTTPS sites";
homepage = "https://github.com/franccesco/getaltname";
changelog = "https://github.com/franccesco/getaltname/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "gsan";
};
}
Loading

0 comments on commit 6e23eb0

Please sign in to comment.