Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2024-03-05 00:12:06 +00:00 committed by GitHub
commit 1ad8409e69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
192 changed files with 2058 additions and 1290 deletions

View File

@ -46,7 +46,7 @@ jobs:
run: |
git clean -f
- name: create PR
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1
with:
body: |
Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.

1
.gitignore vendored
View File

@ -11,6 +11,7 @@ outputs/
result-*
result
repl-result-*
tags
!pkgs/development/python-modules/result
/doc/NEWS.html
/doc/NEWS.txt

View File

@ -12,7 +12,7 @@ an extra indirection.
## Nix expression for a Qt package (default.nix) {#qt-default-nix}
```nix
{ stdenv, lib, qt6, wrapQtAppsHook }:
{ stdenv, qt6 }:
stdenv.mkDerivation {
pname = "myapp";
@ -23,10 +23,12 @@ stdenv.mkDerivation {
}
```
The same goes for Qt 5 where libraries and tools are under `libsForQt5`.
Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers.
::: {.note}
Graphical Linux applications should also include `qtwayland` in `buildInputs`, to ensure the Wayland platform plugin is available.
Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available.
This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674).
:::

View File

@ -903,8 +903,8 @@ with import <nixpkgs>
};
let
rustPlatform = makeRustPlatform {
cargo = rust-bin.stable.latest.minimal;
rustc = rust-bin.stable.latest.minimal;
cargo = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
rustc = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
};
in

View File

@ -681,7 +681,7 @@
};
ajs124 = {
email = "nix@ajs124.de";
matrix = "@andreas.schraegle:helsinki-systems.de";
matrix = "@ajs124:ajs124.de";
github = "ajs124";
githubId = 1229027;
name = "Andreas Schrägle";
@ -9142,6 +9142,12 @@
githubId = 8900;
name = "Johan Magnus Jonsson";
};
jmarmstrong1207 = {
name = "James Armstrong";
email = "jm.armstrong1207@gmail.com";
github = "jmarmstrong1207";
githubId = 32995055;
};
jmbaur = {
email = "jaredbaur@fastmail.com";
github = "jmbaur";

View File

@ -429,7 +429,6 @@ with lib.maintainers; {
helsinki-systems = {
# Verify additions to this team with at least one already existing member of the team.
members = [
ajs124
das_j
];
scope = "Group registration for packages maintained by Helsinki Systems";

View File

@ -56,6 +56,8 @@ in {
# use the setuid wrapped bubblewrap
bubblewrap = "${config.security.wrapperDir}/..";
};
} // optionalAttrs cfg.extest.enable {
extraEnv.LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
});
description = lib.mdDoc ''
The Steam package to use. Additional libraries are added from the system
@ -114,6 +116,11 @@ in {
};
};
};
extest.enable = mkEnableOption (lib.mdDoc ''
Load the extest library into Steam, to translate X11 input events to
uinput events (e.g. for using Steam Input on Wayland)
'');
};
config = mkIf cfg.enable {

View File

@ -1,37 +1,58 @@
{ config, lib, pkgs }: let
{
addDriverRunpath,
glibc,
jq,
lib,
nvidia-container-toolkit,
nvidia-driver,
runtimeShell,
writeScriptBin,
}:
let
mountOptions = { options = ["ro" "nosuid" "nodev" "bind"]; };
mounts = [
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-cuda-mps-control";
# FIXME: Making /usr mounts optional
{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control";
containerPath = "/usr/bin/nvidia-cuda-mps-control"; }
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-cuda-mps-server";
{ hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server";
containerPath = "/usr/bin/nvidia-cuda-mps-server"; }
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-debugdump";
{ hostPath = lib.getExe' nvidia-driver "nvidia-debugdump";
containerPath = "/usr/bin/nvidia-debugdump"; }
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-powerd";
{ hostPath = lib.getExe' nvidia-driver "nvidia-powerd";
containerPath = "/usr/bin/nvidia-powerd"; }
{ hostPath = "${lib.getBin config.hardware.nvidia.package}/bin/nvidia-smi";
{ hostPath = lib.getExe' nvidia-driver "nvidia-smi";
containerPath = "/usr/bin/nvidia-smi"; }
{ hostPath = "${pkgs.nvidia-container-toolkit}/bin/nvidia-ctk";
{ hostPath = lib.getExe' nvidia-container-toolkit "nvidia-ctk";
containerPath = "/usr/bin/nvidia-ctk"; }
{ hostPath = "${pkgs.glibc}/lib";
containerPath = "${pkgs.glibc}/lib"; }
{ hostPath = "${pkgs.glibc}/lib64";
containerPath = "${pkgs.glibc}/lib64"; }
{ hostPath = "${lib.getLib glibc}/lib";
containerPath = "${lib.getLib glibc}/lib"; }
# FIXME: use closureinfo
{
hostPath = addDriverRunpath.driverLink;
containerPath = addDriverRunpath.driverLink;
}
{ hostPath = "${lib.getLib glibc}/lib";
containerPath = "${lib.getLib glibc}/lib"; }
{ hostPath = "${lib.getLib glibc}/lib64";
containerPath = "${lib.getLib glibc}/lib64"; }
];
jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +";
mountsToJq = lib.concatMap
(mount:
["${pkgs.jq}/bin/jq '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"])
["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"])
mounts;
in ''
#! ${pkgs.runtimeShell}
in
writeScriptBin "nvidia-cdi-generator"
''
#! ${runtimeShell}
function cdiGenerate {
${pkgs.nvidia-container-toolkit}/bin/nvidia-ctk cdi generate \
${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \
--format json \
--ldconfig-path ${pkgs.glibc.bin}/bin/ldconfig \
--library-search-path ${config.hardware.nvidia.package}/lib \
--nvidia-ctk-path ${pkgs.nvidia-container-toolkit}/bin/nvidia-ctk
--ldconfig-path ${lib.getExe' glibc "ldconfig"} \
--library-search-path ${lib.getLib nvidia-driver}/lib \
--nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"}
}
cdiGenerate | \

View File

@ -26,9 +26,11 @@
serviceConfig = {
RuntimeDirectory = "cdi";
RemainAfterExit = true;
ExecStart = let
script = (pkgs.writeScriptBin "nvidia-cdi-generator"
(import ./cdi-generate.nix { inherit config lib pkgs; })); in (lib.getExe script);
ExecStart =
let
script = pkgs.callPackage ./cdi-generate.nix { nvidia-driver = config.hardware.nvidia.package; };
in
lib.getExe script;
Type = "oneshot";
};
};

View File

@ -180,7 +180,6 @@ in {
users.groups.vaultwarden = { };
systemd.services.vaultwarden = {
aliases = [ "bitwarden_rs.service" ];
after = [ "network.target" ];
path = with pkgs; [ openssl ];
serviceConfig = {
@ -202,7 +201,6 @@ in {
};
systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) {
aliases = [ "backup-bitwarden_rs.service" ];
description = "Backup vaultwarden";
environment = {
DATA_FOLDER = "/var/lib/bitwarden_rs";
@ -222,7 +220,6 @@ in {
};
systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) {
aliases = [ "backup-bitwarden_rs.timer" ];
description = "Backup vaultwarden on time";
timerConfig = {
OnCalendar = mkDefault "23:00";
@ -240,6 +237,9 @@ in {
};
};
# uses attributes of the linked package
meta.buildDocsInSandbox = false;
meta = {
# uses attributes of the linked package
buildDocsInSandbox = false;
maintainers = with lib.maintainers; [ dotlambda SuperSandro2000 ];
};
}

View File

@ -16,10 +16,20 @@ in
{
options = {
services.miniflux = {
enable = mkEnableOption (lib.mdDoc "miniflux and creates a local postgres database for it");
enable = mkEnableOption (lib.mdDoc "miniflux");
package = mkPackageOption pkgs "miniflux" { };
createDatabaseLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether a PostgreSQL database should be automatically created and
configured on the local host. If set to `false`, you need provision a
database yourself and make sure to create the hstore extension in it.
'';
};
config = mkOption {
type = with types; attrsOf (oneOf [ str int ]);
example = literalExpression ''
@ -38,7 +48,7 @@ in
'';
};
adminCredentialsFile = mkOption {
adminCredentialsFile = mkOption {
type = types.path;
description = lib.mdDoc ''
File containing the ADMIN_USERNAME and
@ -51,14 +61,14 @@ in
};
config = mkIf cfg.enable {
services.miniflux.config = {
services.miniflux.config = {
LISTEN_ADDR = mkDefault defaultAddress;
DATABASE_URL = "user=miniflux host=/run/postgresql dbname=miniflux";
DATABASE_URL = lib.mkIf cfg.createDatabaseLocally "user=miniflux host=/run/postgresql dbname=miniflux";
RUN_MIGRATIONS = 1;
CREATE_ADMIN = 1;
};
services.postgresql = {
services.postgresql = lib.mkIf cfg.createDatabaseLocally {
enable = true;
ensureUsers = [ {
name = "miniflux";
@ -67,7 +77,7 @@ in
ensureDatabases = [ "miniflux" ];
};
systemd.services.miniflux-dbsetup = {
systemd.services.miniflux-dbsetup = lib.mkIf cfg.createDatabaseLocally {
description = "Miniflux database setup";
requires = [ "postgresql.service" ];
after = [ "network.target" "postgresql.service" ];
@ -81,8 +91,9 @@ in
systemd.services.miniflux = {
description = "Miniflux service";
wantedBy = [ "multi-user.target" ];
requires = [ "miniflux-dbsetup.service" ];
after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ];
requires = lib.optional cfg.createDatabaseLocally "miniflux-dbsetup.service";
after = [ "network.target" ]
++ lib.optionals cfg.createDatabaseLocally [ "postgresql.service" "miniflux-dbsetup.service" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/miniflux";
@ -129,6 +140,7 @@ in
include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}"
r ${cfg.package}/bin/miniflux,
r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size,
rw /run/miniflux/**,
}
'';
};

View File

@ -15,6 +15,10 @@ let
ADMIN_USERNAME=${username}
ADMIN_PASSWORD=${password}
'';
postgresPassword = "correcthorsebatterystaple";
postgresPasswordFile = pkgs.writeText "pgpass" ''
*:*:*:*:${postgresPassword}
'';
in
{
@ -56,32 +60,62 @@ in
adminCredentialsFile = customAdminCredentialsFile;
};
};
postgresTcp = { config, pkgs, lib, ... }: {
services.postgresql = {
enable = true;
initialScript = pkgs.writeText "init-postgres" ''
CREATE USER miniflux WITH PASSWORD '${postgresPassword}';
CREATE DATABASE miniflux WITH OWNER miniflux;
'';
enableTCPIP = true;
authentication = ''
host sameuser miniflux samenet scram-sha-256
'';
};
systemd.services.postgresql.postStart = lib.mkAfter ''
$PSQL -tAd miniflux -c 'CREATE EXTENSION hstore;'
'';
networking.firewall.allowedTCPPorts = [ config.services.postgresql.port ];
};
externalDb = { ... }: {
security.apparmor.enable = true;
services.miniflux = {
enable = true;
createDatabaseLocally = false;
inherit adminCredentialsFile;
config = {
DATABASE_URL = "user=miniflux host=postgresTcp dbname=miniflux sslmode=disable";
PGPASSFILE = "/run/miniflux/pgpass";
};
};
systemd.services.miniflux.preStart = ''
cp ${postgresPasswordFile} /run/miniflux/pgpass
chmod 600 /run/miniflux/pgpass
'';
};
};
testScript = ''
start_all()
def runTest(machine, port, user):
machine.wait_for_unit("miniflux.service")
machine.wait_for_open_port(port)
machine.succeed(f"curl --fail 'http://localhost:{port}/healthcheck' | grep OK")
machine.succeed(
f"curl 'http://localhost:{port}/v1/me' -u '{user}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
machine.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
default.wait_for_unit("miniflux.service")
default.wait_for_open_port(${toString defaultPort})
default.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep OK")
default.succeed(
"curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
default.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
default.start()
withoutSudo.start()
customized.start()
postgresTcp.start()
withoutSudo.wait_for_unit("miniflux.service")
withoutSudo.wait_for_open_port(${toString defaultPort})
withoutSudo.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep OK")
withoutSudo.succeed(
"curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
withoutSudo.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
runTest(default, ${toString defaultPort}, "${defaultUsername}:${defaultPassword}")
runTest(withoutSudo, ${toString defaultPort}, "${defaultUsername}:${defaultPassword}")
runTest(customized, ${toString port}, "${username}:${password}")
customized.wait_for_unit("miniflux.service")
customized.wait_for_open_port(${toString port})
customized.succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep OK")
customized.succeed(
"curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep '\"is_admin\":true'"
)
customized.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""')
postgresTcp.wait_for_unit("postgresql.service")
externalDb.start()
runTest(externalDb, ${toString defaultPort}, "${defaultUsername}:${defaultPassword}")
'';
})

View File

@ -416,7 +416,6 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these
```nix
src = fetchgit {
url = "git@github.com:NixOS/nix.git"
url = "git://github.com/NixOS/nix.git";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ=";

View File

@ -74,5 +74,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ linsui ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "amberol";
};
}

View File

@ -1,23 +1,33 @@
{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, lilv, curl, libelf }:
{ stdenv, lib, fetchFromSourcehut, pkg-config, meson, ninja, lv2, lilv, curl, elfutils, xorg }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lv2lint";
version = "0.16.2";
src = fetchurl {
url = "https://git.open-music-kontrollers.ch/lv2/${pname}/snapshot/${pname}-${version}.tar.xz";
sha256 = "sha256-sjgQVx8uGNPWcUwKzGUhChpfzXj/8D8cggVTpcHEXPQ=";
src = fetchFromSourcehut {
domain = "open-music-kontrollers.ch";
owner = "~hp";
repo = "lv2lint";
rev = finalAttrs.version;
hash = "sha256-NkzbKteLZ+P+Py+CMOYYipvu6psDslWnM1MAV1XB0TM=";
};
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ lv2 lilv curl libelf ];
buildInputs = [ lv2 lilv curl elfutils xorg.libX11 ];
mesonFlags = [
(lib.mesonEnable "online-tests" true)
(lib.mesonEnable "elf-tests" true)
(lib.mesonEnable "x11-tests" true)
];
meta = with lib; {
description = "Check whether a given LV2 plugin is up to the specification";
homepage = "https://open-music-kontrollers.ch/lv2/${pname}:";
homepage = "https://git.open-music-kontrollers.ch/~hp/lv2lint";
license = licenses.artistic2;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.all;
platforms = platforms.linux;
mainProgram = "lv2lint";
};
}
})

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "14.0.3";
version = "14.0.4";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-lVGQc33bntvvMMNn8DCYwWGbbRGYvDi6Gxs41t3uLXs=";
sha256 = "sha256-kPh3u6mjTxoqGlhei8kPOyrjU9m7zpv16y5PaGHBsIA=";
};
nativeBuildInputs = [

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "noson";
version = "5.6.5";
version = "5.6.6";
src = fetchFromGitHub {
owner = "janbar";
repo = "noson-app";
rev = finalAttrs.version;
hash = "sha256-UAhaTfj2lCBmHoVEK5IvJfJ9d1OSuZZ+3f5HaTx8hhA=";
hash = "sha256-aBrp+mfY/c6K3dLbDGnEKoUbQC7TlFRQJZCjXPeDZ6s=";
};
nativeBuildInputs = [

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fulcrum";
version = "1.9.8";
version = "1.10.0";
src = fetchFromGitHub {
owner = "cculianu";
repo = "Fulcrum";
rev = "v${version}";
sha256 = "sha256-cWrhALYIjhOCKi/uPXD8Ty0wuN4WQq+8o97M6CtW+YE=";
sha256 = "sha256-HTyOlbrmZHN2MbG70auGkuPPo3fTN/oCHi6Lwnq+gKk=";
};
nativeBuildInputs = [ pkg-config qmake ];

View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "emptty";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "tvrzna";
repo = pname;
rev = "v${version}";
hash = "sha256-nReExxLbqlbzx1F1vk8qftWafG8umH988egsalSUals=";
hash = "sha256-64Ta0k4TzJcQC+RDybHzFUj96ZSRUOeYQ2U9KFjDXjk=";
};
buildInputs = [ pam libX11 ];

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "texstudio";
version = "4.7.2";
version = "4.7.3";
src = fetchFromGitHub {
owner = "texstudio-org";
repo = "texstudio";
rev = finalAttrs.version;
hash = "sha256-Q4/aoLIxFssti3Dto1JwRRAQ+D3DHlH9JgDrHBVKg4M=";
hash = "sha256-hAuNjlFr23l5ztfoa2RTHKZtH2aXF1EuWTd/ZyKuyHg=";
};
nativeBuildInputs = [
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
spell checking and support of any compilation chain.
'';
homepage = "https://texstudio.org";
changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt";
changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/CHANGELOG.txt";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ ajs124 cfouche ];

View File

@ -36,20 +36,20 @@ let
pcsx2_patches = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2_patches";
rev = "189f79d73f8cd9fd85c7394a14ee4419ddfa267b";
sha256 = "sha256-gxwAxR7N7QU4sTGHTdd656dmsW8MrcfroYPvv2UoeRc=";
rev = "e3b354f144de71d2b87471166cca8911867c1dfd";
sha256 = "sha256-H7cFyBYZumcCZ0/FFOFZoChoi0XPs4siA4dHcFt9U7k=";
};
in
llvmPackages_17.stdenv.mkDerivation rec {
pname = "pcsx2";
version = "1.7.5497";
version = "1.7.5587";
src = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-gbJkeelSyEHwD4DH/hbzPNNv47hmdgc4kyvX38txYhc=";
sha256 = "sha256-PCZ1r6x28Z5FEVMXWm4oxpTknz/XEiwo0rRGhn4B33g=";
};
patches = [

View File

@ -77,5 +77,6 @@ python3.pkgs.buildPythonApplication rec {
maintainers = with maintainers; [ linsui ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "dialect";
};
}

View File

@ -21,19 +21,19 @@
stdenv.mkDerivation rec {
pname = "diebahn";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitLab {
owner = "schmiddi-on-mobile";
repo = "railway";
rev = version;
hash = "sha256-o1WJJslZLg3UlMLmHDeEozsP8CmMU9e7MqONpIKuq80=";
hash = "sha256-2iLxErEP0OG+BcG7fvJBzNjh95EkNoC3NC7rKxPLhYk=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${src}";
inherit src;
hash = "sha256-/DSbkZev9A7TqRgnCop3PDd8vzSvyOevvl+pBCk1ri0=";
hash = "sha256-TyafdFWCaZgLEW2yVfm9+9kXRKoiyCAbRndcb7XCVdI=";
};
nativeBuildInputs = [

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "gimoji";
version = "0.7.6";
version = "1.0.0";
src = fetchFromGitHub {
owner = "zeenix";
repo = "gimoji";
rev = version;
hash = "sha256-ipsEFZGC3JYOeNVI4AUb2c/9tt+TTIbeXuJ15ShEH6U=";
hash = "sha256-O4rIla/vpei+N2TXB2eIrFAkOyguE9gCQgVptl2mn0w=";
};
cargoHash = "sha256-786OPEaIHQtgUHlkjLprKfJ7VoeSW+IzHto3XXZ6Fu8=";
cargoHash = "sha256-ne7b95snaoji3mF3yN6ZvTSnQxJvLT7jOMbh5U10YgU=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit

View File

@ -42,6 +42,6 @@ mkDerivation {
homepage = "https://kiwix.org";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ajs124 ];
maintainers = with maintainers; [ ];
};
}

View File

@ -14,13 +14,13 @@
python310Packages.buildPythonApplication rec {
pname = "nwg-displays";
version = "0.3.13";
version = "0.3.14";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-displays";
rev = "refs/tags/v${version}";
hash = "sha256-ZXEnlcifwJTnpSKVET/ThIA0NHLP9fQTIM2bQbJ7qZ8=";
hash = "sha256-jSL+ig1mNJrnHli8B+BqvEG8jcC0gnxzbukiYgt3nP0=";
};
nativeBuildInputs = [

View File

@ -6,19 +6,22 @@ stdenv.mkDerivation (finalAttrs: let
in
{
pname = "remnote";
version = "1.13.52";
version = "1.14.13";
src = fetchurl {
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
hash = "sha256-4wN4lqeA9olo6igr1M1JhecPG/ruVivdOyWiRlDAzQQ=";
hash = "sha256-WpNgdQGNz1Vv3MQe6tgnkzf+rvxMeoDQns5SqKNP7F8=";
};
appexec = appimageTools.wrapType2 {
inherit pname version src;
};
icon = fetchurl {
url = "https://www.remnote.io/icon.png";
hash = "sha256-r5D7fNefKPdjtmV7f/88Gn3tqeEG8LGuD4nHI/sCk94=";
};
desktopItem = makeDesktopItem {
type = "Application";
name = "remnote";
@ -29,18 +32,21 @@ in
categories = [ "Office" ];
mimeTypes = [ "x-scheme-handler/remnote" "x-scheme-handler/rn" ];
};
dontUnpack = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -D ${appexec}/bin/remnote-${version} $out/bin/remnote
install -m 444 -D "${desktopItem}/share/applications/"* -t $out/share/applications/
install -m 444 -D ${icon} $out/share/pixmaps/remnote.png
install -Dm755 ${appexec}/bin/remnote-${version} $out/bin/remnote
install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/
install -Dm444 ${icon} $out/share/pixmaps/remnote.png
runHook postInstall
'';
meta = with lib; {
description = "A note-taking application focused on learning and productivity";
homepage = "https://remnote.com/";

View File

@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: rec {
postPatch = ''
chmod +x build-aux/meson/postinstall.py
patchShebangs build-aux/meson/postinstall.py
substituteInPlace src/functions.vala --replace "/usr/local/etc/xdg/swaync" "$out/etc/xdg/swaync"
'';
passthru.tests.version = testers.testVersion {

View File

@ -70,5 +70,6 @@ python3.pkgs.buildPythonApplication rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ samalws ];
mainProgram = "wike";
};
}

View File

@ -93,11 +93,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.63.162";
version = "1.63.165";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-kRIYdSBAjBVX3EZQv0OWifD+XIpGAqAVTcrdxGAifEI=";
hash = "sha256-UyzOV6sUv7WdwN31TIg35HGchrUSXnvzk3Aba/d8dJc=";
};
dontConfigure = true;

View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.10.1";
version = "2.10.2";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
hash = "sha256-sQbRrNTeLUSal9gBAnqx+x0glPykjw0DN+j7xHoZcLY=";
hash = "sha256-eFa2AXFVymi7et+fHTLgdiBUq6D8zK5DRg9Dqhxe4TE=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-WVufVd8E2rVBA59qEYdRq38W70lApMGZV/26jhn5HGw=";
vendorHash = "sha256-O13zMtrXgW3SiJmAn64/QW/CJN0+d0h0MMyEWKsy9WE=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubevpn";
version = "2.2.1";
version = "2.2.3";
src = fetchFromGitHub {
owner = "KubeNetworks";
repo = "kubevpn";
rev = "v${version}";
hash = "sha256-inGqkkzXPjg2VHtPZEPWDTuioPchrf/kiLGjvgXpcI4=";
hash = "sha256-C1Fw7E7lXy9BRj8bTVUMzPK6wBiL6A3VGDYUqdD2Rjs=";
};
vendorHash = null;

View File

@ -3,13 +3,13 @@
buildGoModule rec {
pname = "discordo";
version = "unstable-2024-02-25";
version = "unstable-2024-03-03";
src = fetchFromGitHub {
owner = "ayn2op";
repo = pname;
rev = "6e683a6526279a8c0f9f8a03be776d62214a4d13";
hash = "sha256-sPNJkzVulgbm3OdJWSj6i2YOKin9VO0L3aS2c0alwBE=";
rev = "ce2091d566f2d999d83b3c9463860b73f1d163ae";
hash = "sha256-71i/8t768RtD0Gk2cpSdznERSNf1gErQrrOGYiZz05g=";
};
vendorHash = "sha256-dBJYTe8aZtNuBwmcpXb3OEHoLVCa/GbGExLIRc8cVbo=";

File diff suppressed because it is too large Load Diff

View File

@ -25,13 +25,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "newsflash";
version = "3.1.3";
version = "3.1.5";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = "refs/tags/v.${finalAttrs.version}";
hash = "sha256-eaZkuFy+pDL09S8TQjpUUPIy+mFIwBScgc8hgbkRJDc=";
hash = "sha256-6RkZdRQ/pNq6VkL9E2BaAWbKKGbCpEC+skGHPe3TwH8=";
};
cargoDeps = rustPlatform.importCargoLock {

View File

@ -11,11 +11,11 @@
}:
let
pname = "beeper";
version = "3.97.44";
version = "3.98.16";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.97.44-build-2402237nrc018ws-x86_64.AppImage";
hash = "sha256-z7SKs3ID8tnBwhhd6Z1khR+qjMQ7ivbkCAB49XYxnSs=";
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.98.16-build-240228llcputn9l-x86_64.AppImage";
hash = "sha256-CjtlE/owx7emzGDdOAw6pSlAuNbUspm1YP+kxm6Jrt8=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;

View File

@ -83,5 +83,6 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ emilytrau ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "fragments";
};
}

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "transgui";
version = "unstable-2023-10-19";
version = "unstable-2024-02-26";
src = fetchFromGitHub {
owner = "transmission-remote-gui";
repo = "transgui";
rev = "b1f5c2334edb6659c04863ef4a534ba1e57284f0";
hash = "sha256-XCokcA5lINC9B+qwg0vjkymwa16ZNHRKLI829+X7CvE=";
rev = "25df397d92fbd53b970ef72a6ffd9f644458f935";
hash = "sha256-jQIe2vTDeJM/lhl6alNhEPOqXjyd18x+Kg29+le/dks=";
};
nativeBuildInputs = [ pkg-config unzip ];

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lean4";
version = "4.6.0";
version = "4.6.1";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean4";
rev = "v${finalAttrs.version}";
hash = "sha256-Anf6uaTFG/c94N7b7HgT5riyOL5xbHeeoYTrrOl2vDA=";
hash = "sha256-wUqGADwSocg2ciycCxg9qp+vJLJ2otA/5JpTrkFrDoQ=";
};
postPatch = ''

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "2.0.4";
version = "2.1.2";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
hash = "sha256-0ReMn37sYpS5uX9Nem7M9LthAvGNdJaAob+tEnjIrMw=";
hash = "sha256-5NWMpdrOWQcA3cxd5WNtnamnSMuZU3BGEMlRZ8NR+NE=";
};
cargoHash = "sha256-xDIXXHoykEtRzWm5NDE1rcFgC4iFxhUPgwlvaoHmV6Y=";
cargoHash = "sha256-kIO3mD4SdQqlZYty8QWOBVvmaXujcEijeRONGYNZSng=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;

View File

@ -10,7 +10,7 @@
}:
let
version = "5.12.186";
version = "5.12.191";
in
rustPlatform.buildRustPackage {
pname = "git-mit";
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth";
repo = "git-mit";
rev = "v${version}";
hash = "sha256-895QAtKUzqiWffw5IgovXBiARncelrmz1FUEbeHYoW0=";
hash = "sha256-aSEoAs0s7zyALf3s77eVlrjkCrn7ihW/4OW5hN8YL8k=";
};
cargoHash = "sha256-E3xwZ9oB7oe5gVLAasvo1MWPjDPLKZgSX98VZAq2O3k=";
cargoHash = "sha256-pm+XreLGxZJKRcrmU1ooMjN7MTRJqgKOy2J1OqdodxE=";
nativeBuildInputs = [ pkg-config ];

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "hyprshade";
version = "3.0.3";
version = "3.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "loqusion";
repo = "hyprshade";
rev = "refs/tags/${version}";
hash = "sha256-vX1Cc170ifevn1aji5s0MI7G0zktPuvSpAbYpGPMudA=";
hash = "sha256-bH+QXvZ+Yaogcp/MYJopiAUvM/imNrSo+cotTzzdlV8=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,42 @@
{ lib
, buildGoModule
, fetchFromGitHub
, libpcap
}:
buildGoModule rec {
pname = "adalanche";
version = "2024.1.11";
src = fetchFromGitHub {
owner = "lkarlslund";
repo = "adalanche";
rev = "refs/tags/v${version}";
hash = "sha256-SJa2PQCXTYdv5jMucpJOD2gC7Qk2dNdINHW4ZvLXSLw=";
};
vendorHash = "sha256-3HulDSR6rWyxvImWBH1m5nfUwnUDQO9ALfyT2D8xmJc=";
buildInputs = [
libpcap
];
ldflags = [
"-s"
"-w"
"-X=github.com/lkarlslund/adalanche/modules/version.Version=${version}"
];
env = {
CGO_CFLAGS = "-Wno-undef-prefix";
};
meta = with lib; {
description = "Active Directory ACL Visualizer and Explorer";
homepage = "https://github.com/lkarlslund/adalanche";
changelog = "https://github.com/lkarlslund/Adalanche/releases/tag/v${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
mainProgram = "adalanche";
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aocl-utils";
version = "4.1";
version = "4.2";
src = fetchFromGitHub {
owner = "amd";
repo = "aocl-utils";
rev = version;
hash = "sha256-7Vc3kE+YfqIt6VfvSamsVQRemolzs1sNJUVUZFKk/O8=";
hash = "sha256-tjmCgVSU4XjBhbKMUY3hsvj3bvuXvVdf5Bqva5nr1tc=";
};
nativeBuildInputs = [ cmake ];

View File

@ -0,0 +1,40 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "audiness";
version = "0.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "audiusGmbH";
repo = "audiness";
rev = "refs/tags/${version}";
hash = "sha256-FSZ3EyLGtTCmeIRg2aHB/U14yPa5CpTLdqIZ6eyRtXQ=";
};
nativeBuildInputs = with python3.pkgs; [
poetry-core
];
propagatedBuildInputs = with python3.pkgs; [
pytenable
typer
validators
] ++ typer.optional-dependencies.all;
pythonImportsCheck = [
"audiness"
];
meta = with lib; {
description = "CLI tool to interact with Nessus";
homepage = "https://github.com/audiusGmbH/audiness";
changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "audiness";
};
}

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bmake";
version = "20240212";
version = "20240301";
src = fetchurl {
url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
hash = "sha256-lx1aNkA1NJ6YTYLCpI1Uagxz5S87jyqimjvj0kCP+qg=";
hash = "sha256-JM4L46z8i5PHWgeWxi7swWN246fAVXCzAtIEgOOOn1k=";
};
patches = [

View File

@ -0,0 +1,72 @@
{ lib
, stdenv
, fetchurl
, makeBinaryWrapper
, copyDesktopItems
, makeDesktopItem
, unzip
, jdk8
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dirbuster";
version = "1.0-RC1";
src = fetchurl {
url = "mirror://sourceforge/dirbuster/DirBuster%20(jar%20%2B%20lists)/${finalAttrs.version}/DirBuster-${finalAttrs.version}.tar.bz2";
hash = "sha256-UoEt1NkaLsKux3lr+AB+TZCCshQs2hIo63igT39V68E=";
};
desktopItems = [
(makeDesktopItem {
name = "dirbuster";
desktopName = "OWASP DirBuster";
exec = "dirbuster";
icon = "dirbuster";
comment = "Web Application Brute Forcing";
categories = [ "Network" ];
})
];
nativeBuildInputs = [
makeBinaryWrapper
copyDesktopItems
unzip
];
installPhase = ''
runHook preInstall
export JAR=$out/share/java/dirbuster.jar
install -Dm444 DirBuster-${finalAttrs.version}.jar $JAR
makeWrapper ${jdk8}/bin/java $out/bin/dirbuster \
--add-flags "-Duser.dir=$out/share/dirbuster/" \
--add-flags "-Xmx256M" \
--add-flags "-jar $JAR"
cp -r lib/ $out/share/java/lib/
# Copy wordlists
mkdir -p $out/share/dirbuster
for f in *.txt; do
cp $f $out/share/dirbuster/
done
# Extract embedded desktop icon
mkdir -p $out/share/pixmaps
unzip $JAR
strings com/sittinglittleduck/DirBuster/ImageCreator.class | grep iVBORw0KG | base64 -d > $out/share/pixmaps/dirbuster.png
runHook postInstall
'';
meta = {
description = "Brute force directories and files names on web/application servers";
homepage = "https://wiki.owasp.org/index.php/Category:OWASP_DirBuster_Project";
license = lib.licenses.lgpl21Only;
mainProgram = "dirbuster";
maintainers = with lib.maintainers; [ emilytrau ];
platforms = lib.platforms.all;
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
};
})

View File

@ -0,0 +1,26 @@
{ lib
, fetchFromGitHub
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "extest";
version = "1.0.2";
src = fetchFromGitHub {
owner = "Supreeeme";
repo = "extest";
rev = version;
hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw=";
};
cargoHash = "sha256-JZPiTzr9KaaqiXKhsGOYmYMtjNzPQzKhqyfSlbeqME8=";
meta = with lib; {
description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland";
homepage = "https://github.com/Supreeeme/extest";
platforms = platforms.linux;
license = licenses.mit;
maintainers = [ maintainers.puffnfresh ];
};
}

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "feather";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "feather-wallet";
repo = "feather";
rev = finalAttrs.version;
hash = "sha256-23rG+12pAw33rm+jDu9pp8TsumNYh+UbnbeEKs4yB+M=";
hash = "sha256-pQnaJbKznK1i8wn7t8ZnxLVu1LV/D47krxZZ0j6Mw6g=";
fetchSubmodules = true;
};

View File

@ -0,0 +1,71 @@
{ lib
, asciidoctor
, fetchFromGitLab
, ncurses
, stdenv
}:
stdenv.mkDerivation (finalAttrs: {
pname = "galaxis";
version = "1.11";
src = fetchFromGitLab {
owner = "esr";
repo = "galaxis";
rev = finalAttrs.version;
hash = "sha256-fSzifGoSdWyFGt99slzAsqCMDoeLbBqQGXujX8QAfGc=";
};
outputs = [ "out" "man" ];
nativeBuildInputs = [
asciidoctor
];
buildInputs = [
ncurses
];
strictDeps = true;
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"galaxis"
"galaxis.6"
];
postPatch = ''
sed -i -E '/[[:space:]]*xmlto/ s|xmlto|xmlto --skip-validation|' Makefile
'';
# This is better than sed-patch the Makefile
installPhase = ''
runHook preInstall
mkdir -p $out/bin $man/share/man/man6
install -Dm755 galaxis -t $out/bin/
install -Dm644 galaxis.6 -t $man/share/man/man6
runHook postInstall
'';
meta = {
description = "Rescue lifeboats lost in interstellar space";
longDescription = ''
Lifeboats from a crippled interstellar liner are adrift in a starfield. To
find them, you can place probes that look in all eight compass directions
and tell you how many lifeboats they see. If you drop a probe directly on
a lifeboat it will be revealed immediately. Your objective: find the
lifeboats as quickly as possible, before the stranded passengers run out
of oxygen!
This is a UNIX-hosted, curses-based clone of the nifty little Macintosh
freeware game Galaxis. It doesn't have the super-simple, point-and-click
interface of the original, but compensates by automating away some of the
game's simpler deductions.
'';
homepage = "http://catb.org/~esr/galaxis/";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "galaxis";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
})

View File

@ -0,0 +1,60 @@
{ stdenv
, lib
, fetchFromGitLab
, gobject-introspection
, meson
, ninja
, pkg-config
, vala
, glib
, libgee
, libxml2
, gitUpdater
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gxml";
version = "0.20.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "gxml";
rev = finalAttrs.version;
hash = "sha256-GlctGxsLyQ2kPV3oBmusRiouG4PPncBTh3vgxhVaQOo=";
};
nativeBuildInputs = [
gobject-introspection
meson
ninja
pkg-config
vala
];
propagatedBuildInputs = [
glib
libgee
libxml2
];
postPatch = ''
# https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/24
substituteInPlace gxml/gxml.pc.in \
--replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include"
'';
doCheck = true;
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "GXml provides a GObject API for manipulating XML and a Serializable framework from GObject to XML";
homepage = "https://gitlab.gnome.org/GNOME/gxml";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ jmarmstrong1207 ] ++ teams.gnome.members;
};
})

View File

@ -0,0 +1,19 @@
{ ioquake3, fetchFromGitHub, pan-bindings, libsodium, lib }:
ioquake3.overrideAttrs (old: {
pname = "ioq3-scion";
version = "unstable-2024-03-03";
buildInputs = old.buildInputs ++ [
pan-bindings
libsodium
];
src = fetchFromGitHub {
owner = "lschulz";
repo = "ioq3-scion";
rev = "9f06abd5030c51cd4582ba3d24ba87531e3eadbc";
hash = "sha256-+zoSlNT+oqozQFnhA26PiMo1NnzJJY/r4tcm2wOCBP0=";
};
meta = {
description = "ioquake3 with support for path aware networking";
maintainers = with lib.maintainers; [ matthewcroughan ];
};
})

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kor";
version = "0.3.5";
version = "0.3.6";
src = fetchFromGitHub {
owner = "yonahd";
repo = pname;
rev = "v${version}";
hash = "sha256-Y8k7tpKqs/X5ePa2kFkKxrYb1E4Z5h8+o229eD6YQ/M=";
hash = "sha256-Q2VUc91ecBRr/m9DGYWwuSsH2prB+EKmBoQrekgPvTE=";
};
vendorHash = "sha256-DRbwM6fKTIlefD0rUmNLlUXrK+t3vNCl4rxHF7m8W10=";

View File

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "mev-boost";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "flashbots";
repo = "mev-boost";
rev = "v${version}";
hash = "sha256-vzgX9irpI5i85bohppyL5KWQuf71SryRu1gkhWSCVKk=";
hash = "sha256-Z5B+PRYb6eWssgyaXpXoHOVRoMZoSAwun7s6Fh1DrfM=";
};
vendorHash = "sha256-xw3xVbgKUIDXu4UQD5CGftON8E4o1u2FcrPo3n6APBE=";
vendorHash = "sha256-yfWDGVfgCfsmzI5oxEmhHXKCUAHe6wWTkaMkBN5kQMw=";
meta = with lib; {
description = "Ethereum block-building middleware";

View File

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule {
pname = "nc4nix";
version = "0-unstable-2024-03-01";
src = fetchFromGitHub {
owner = "helsinki-systems";
repo = "nc4nix";
rev = "ba37674c0dddf93e0a011dace92ec7f0ec834765";
hash = "sha256-k12eeP2gojLCsJH1GGuiTmxz3ViPc0+oFBuptyh42Bw=";
};
vendorHash = "sha256-ZXl4kMDY9ADkHUcLsl3uNpyErMzbgS+J65+uUeIXpSE=";
meta = with lib; {
description = "Packaging helper for Nextcloud apps";
homepage = "https://github.com/helsinki-systems/nc4nix";
license = licenses.mit;
maintainers = with maintainers; [ onny ];
platforms = platforms.linux;
};
}

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "netclient";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "gravitl";
repo = "netclient";
rev = "v${version}";
hash = "sha256-7raWk4Y/ZrSaGKPLrrnD49aDALkZ+Nxycd+px8Eks10=";
hash = "sha256-Wglh6tcpanEmXwoRKdAot/l4RS+EbIIHI1etQ9ic7BI=";
};
vendorHash = "sha256-lRXZ9iSWQEKWmeQV1ei/G4+HvqhW9U8yUv1Qb/d2jvY=";
vendorHash = "sha256-or/0z+RiOkZ2qgEqXNI/LafN+eWAzvLuSZta/QNUI3g=";
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa
++ lib.optional stdenv.isLinux libX11;

View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, darwin
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nowplaying-cli";
version = "1.2.1";
src = fetchFromGitHub {
owner = "kirtan-shah";
repo = "nowplaying-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-FkyrtgsGzpK2rLNr+oxfPUbX43TVXYeiBg7CN1JUg8Y=";
};
buildInputs = [
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Cocoa
];
installPhase = ''
runHook preInstall
install -D nowplaying-cli $out/bin/nowplaying-cli
runHook postInstall
'';
meta = with lib; {
description = "macOS command-line utility for retrieving currently playing media";
homepage = "https://github.com/kirtan-shah/nowplaying-cli";
license = licenses.gpl3Only;
maintainers = with maintainers; [ emilytrau ];
platforms = platforms.darwin;
mainProgram = "nowplaying-cli";
};
})

View File

@ -7,6 +7,7 @@
, fuse
, installShellFiles
, wrapGAppsHook
, wrapperDir ? "/run/wrappers/bin"
}:
let
pname = "onedriver";
@ -40,6 +41,7 @@ buildGoModule {
install -Dm644 ./pkg/resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png
install -Dm644 ./pkg/resources/onedriver.desktop $out/share/applications/onedriver.desktop
install -Dm644 ./pkg/resources/onedriver@.service $out/lib/systemd/user/onedriver@.service
mkdir -p $out/share/man/man1
installManPage ./pkg/resources/onedriver.1
@ -47,6 +49,10 @@ buildGoModule {
substituteInPlace $out/share/applications/onedriver.desktop \
--replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \
--replace "/usr/share/icons" "$out/share/icons"
substituteInPlace $out/lib/systemd/user/onedriver@.service \
--replace "/usr/bin/onedriver" "$out/bin/onedriver" \
--replace "/usr/bin/fusermount" "${wrapperDir}/fusermount"
'';
meta = with lib; {

View File

@ -0,0 +1,61 @@
{ lib
, stdenv
, fetchFromGitHub
, buildGo122Module
, cmake
, ncurses
, asio
}:
let
version = "unstable-2024-03-03";
src = fetchFromGitHub {
owner = "lschulz";
repo = "pan-bindings";
rev = "4361d30f1c5145a70651c259f2d56369725b0d15";
hash = "sha256-0WxrgXTCM+BwGcjjWBBKiZawje2yxB5RRac6Sk5t3qc=";
};
goDeps = (buildGo122Module {
name = "pan-bindings-goDeps";
inherit src version;
modRoot = "go";
vendorHash = "sha256-7EitdEJTRtiM29qmVnZUM6w68vCBI8mxZhCA7SnAxLA=";
});
in
stdenv.mkDerivation {
name = "pan-bindings";
inherit src version;
cmakeFlags = [
"-DBUILD_SHARED_LIBS=1"
"-DBUILD_EXAMPLES=0"
];
patchPhase = ''
runHook prePatch
export HOME=$TMP
cp -r --reflink=auto ${goDeps.goModules} go/vendor
runHook postPatch
'';
buildInputs = [
ncurses
asio
];
nativeBuildInputs = [
cmake
goDeps.go
];
meta = with lib; {
description = "SCION PAN Bindings for C, C++, and Python";
homepage = "https://github.com/lschulz/pan-bindings";
license = licenses.asl20;
maintainers = with maintainers; [ matthewcroughan ];
mainProgram = "pan-bindings";
platforms = platforms.all;
};
}

View File

@ -1,17 +1,20 @@
{ lib, fetchFromGitHub, php }:
{ lib
, fetchFromGitHub
, php
}:
php.buildComposerProject (finalAttrs: {
pname = "phpunit";
version = "11.0.3";
version = "11.0.4";
src = fetchFromGitHub {
owner = "sebastianbergmann";
repo = "phpunit";
rev = finalAttrs.version;
hash = "sha256-ASeALfqcDUoK2PSl88AJ3UgrLdesuH1o5UNq+ceGbxI=";
hash = "sha256-ucUDeiqz8QkCsKM/SfHVjJSnfs0TRaV04CTKepSzyo0=";
};
vendorHash = "sha256-2rG0ERgI5oVW3MuU8yFwgssoWX6zwUwXpro2IVkX7ac=";
vendorHash = "sha256-0jbSUIT4Eh1lWu11REgE4ilGlw1zuawXeKCPBHnoxdk=";
meta = {
changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";

View File

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "pql";
version = "0.1.0";
src = fetchFromGitHub {
owner = "runreveal";
repo = "pql";
rev = "v${version}";
hash = "sha256-xNWwjDdnF4+IvS814iJlqCFYNOGNF2nHEnnbRqxJsjM=";
};
vendorHash = "sha256-j/R+1PWfX+lmm99cHWSuo+v8RxKg089Bvb4rFHpmpfE=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Pipelined Query Language";
homepage = "https://github.com/runreveal/pql";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
mainProgram = "pql";
};
}

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ready-check";
version = "1.2.5";
version = "1.2.6";
pyproject = true;
src = fetchFromGitHub {
owner = "sesh";
repo = "ready";
rev = "refs/tags/v${version}";
hash = "sha256-eerYxpn1f+d1PQJCDlH9kD1KKlkL/dQFUpbSRcNoXlI=";
hash = "sha256-j0UY2Q1jYGRtjvaWMwgMJrNaQZQnEJ5ST4o4PAVYWVc=";
};
nativeBuildInputs = with python3.pkgs; [

View File

@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rectangle-pro";
version = "3.0.11";
version = "3.0.19";
src = fetchurl {
url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
hash = "sha256-Hs2eRO5DpYoY0rLfcmGZRHjmg+wddz/+LE0u4E9gCTk=";
hash = "sha256-ZWIjxaxV90I42Stg7jFUItJBZLoXm8iLIeQzcssRQLA=";
};
sourceRoot = ".";

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication {
pname = "renode-dts2repl";
version = "unstable-2024-02-26";
version = "unstable-2024-02-29";
pyproject = true;
src = fetchFromGitHub {
owner = "antmicro";
repo = "dts2repl";
rev = "de8d8b276ceaae79ea90ed67065e9616e06b2558";
hash = "sha256-uiS/zzAf4lCg/yUAoci2JXrmwb3xsObuzSi1U08lSjo=";
rev = "a53f2f01039a462bdd7322d1fb315edd95033b6d";
hash = "sha256-DsHNS9pZu3ZWM3teG3pUi0EM+8znmCPTSGuzGmJ4IgU=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,53 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
let
version = "0.10.0";
# Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here.
# ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96
skipTest = lineOffset: testCase: file:
let
jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]);
in
''
sed -i -e '/${testCase}/{
${jumpAndAppend} t.Skip();
}' ${file}
'';
in
buildGoModule {
pname = "scion";
inherit version;
src = fetchFromGitHub {
owner = "scionproto";
repo = "scion";
rev = "v${version}";
hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI=";
};
vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8=";
excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ];
# This can be removed in the next release of scion since its fixed upstream
# https://github.com/scionproto/scion/pull/4476
postConfigure = ''
# This test needs docker, so lets skip it
${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"}
'';
doCheck = true;
meta = with lib; {
description = "A future Internet architecture utilizing path-aware networking";
homepage = "https://scion-architecture.net/";
platforms = platforms.unix;
license = licenses.asl20;
maintainers = with maintainers; [ sarcasticadmin matthewcroughan ];
};
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.33.0";
version = "2.33.1";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
hash = "sha256-1bakWUhB47o37pV6cbfDRdHdqreGKFhU7LFajIM5mhw=";
hash = "sha256-nKbdwgxHiI1N2REEI7WrPf54uy4Nm1XU0g5hEjYriEY=";
};
vendorHash = "sha256-9rYShpUVI3KSY6UgGmoXo899NkUezkAAkTgFPdq094E=";

View File

@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stats";
version = "2.9.11";
version = "2.10.3";
src = fetchurl {
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
hash = "sha256-L7E3naVeFYxeS8OAEkXEgY7YB+6E+yrGfIAUr52EWvA=";
hash = "sha256-PSRK9YihiIHKHade3XE/OnAleBhmu71CNFyzJ/Upx/A=";
};
sourceRoot = ".";

View File

@ -4,16 +4,16 @@
}:
buildGoModule rec {
pname = "tdl";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "iyear";
repo = "tdl";
rev = "v${version}";
hash = "sha256-Myf10+Y7lyJFhiRpJFkXe5Rng0ChzOm0EGvPEuFMYp4=";
hash = "sha256-xSnACm7LrsyhtQevDtP36bKeExSFd4Xsn7xLSLi7i+I=";
};
vendorHash = "sha256-n3AISS4/yujTNqgGjeEK2eWw0YI1XUafZP36yD+axN4=";
vendorHash = "sha256-VYxTSon2U9qj9sbMSlXrDFeOTOZXQVX2PyS+EDBG+YM=";
ldflags = [
"-s"

View File

@ -14,16 +14,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "universal-android-debloater";
version = "0.6.2";
version = "1.0.2";
src = fetchFromGitHub {
owner = "Universal-Debloater-Alliance";
repo = pname;
rev = version;
hash = "sha256-yCtdCg2mEAz4b/ev32x+RbjCtHTu20mOKFgtckXk1Fo=";
repo = "universal-android-debloater-next-generation";
rev = "v${version}";
hash = "sha256-v2svWAurYoUZzOHypM+Pk0FCnfSi1NH80jIafYxwLPQ=";
};
cargoHash = "sha256-70dX5fqORdGG2q3YeXJHABCHy0dvtA/Cptk8aLGNgV4=";
cargoHash = "sha256-gO1tvY565T+361JNVkFH4pC1ky2oxJqp/OCbS9sNeMI=";
buildInputs = [
expat
@ -46,17 +46,17 @@ rustPlatform.buildRustPackage rec {
'';
postInstall = ''
wrapProgram $out/bin/uad_gui \
wrapProgram $out/bin/uad-ng \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \
--suffix PATH : ${lib.makeBinPath [ android-tools ]}
'';
meta = with lib; {
description = "A tool to debloat non-rooted Android devices";
changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater/blob/${src.rev}/CHANGELOG.md";
homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater";
changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/blob/${src.rev}/CHANGELOG.md";
homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation";
license = licenses.gpl3Only;
mainProgram = "uad_gui";
mainProgram = "uad-ng";
maintainers = with maintainers; [ xfix ];
platforms = platforms.linux;
};

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "unrar-free";
version = "0.1.3";
version = "0.2.0";
src = fetchFromGitLab {
owner = "bgermann";
repo = "unrar-free";
rev = finalAttrs.version;
hash = "sha256-pNcbbHFcEzXKGKUg9nLM3NuUCgZFmFjFa4dXmUuuLYo";
hash = "sha256-ONLc/mJt13Lfd61qraCAB9jOPzdPxoYLzq69llRf+BU=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View File

@ -0,0 +1,21 @@
{ lib, buildGoModule, fetchurl, pkg-config }:
buildGoModule rec {
pname = "zabbix-agent2-plugin-postgresql";
version = "6.0.25";
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz";
hash = "sha256-NFohopyUFO2C1k5moM4qkXX0Q9zc8W0Z+WrvZ5lgr1I=";
};
vendorHash = null;
meta = with lib; {
description = "Required tool for Zabbix agent integrated PostgreSQL monitoring";
homepage = "https://www.zabbix.com/integrations/postgresql";
license = licenses.asl20;
maintainers = with maintainers; [ gador ];
platforms = platforms.linux;
};
}

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "unifont_upper";
version = "15.1.04";
version = "15.1.05";
src = fetchurl {
url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf";
hash = "sha256-SUsG2xhrn47zrGpNzRn1g76qyt2vQyH/UBmYtzCD0UA=";
hash = "sha256-A/Z/+IMNUH/3Ir3ewf/U2xqkkpZDUDKO+dlnRYt+7U0=";
};
dontUnpack = true;

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ddccontrol-db";
version = "20240209";
version = "20240304";
src = fetchFromGitHub {
owner = "ddccontrol";
repo = pname;
rev = version;
sha256 = "sha256-Jmq8W9LHL+B4mY0meI9CtKvJw6NnF83kDaUG8Hbsj4Q=";
sha256 = "sha256-vXG9aa6Zdv5R7q62tpFaUIw4MVnT/jWwZ+jw1S9K7MM=";
};
nativeBuildInputs = [ autoreconfHook intltool ];

View File

@ -25,9 +25,9 @@ in
mkXfceDerivation {
category = "apps";
pname = "xfce4-screensaver";
version = "4.18.2";
version = "4.18.3";
sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs=";
sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ=";
nativeBuildInputs = [
gobject-introspection

View File

@ -17,12 +17,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.66.0";
version = "1.67.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
sha256 = "sha256-7O2YUZq0GBS2xvsXg0v55XZXAzqsbHjeKNgqMbNRT8E=";
hash = "sha256-ftKtqKIgGVqiETTsirhydjmFiozqHoMRdu+IBZc8iMI=";
fetchSubmodules = true;
};

View File

@ -24,13 +24,13 @@ let
in stdenv.mkDerivation rec {
pname = "openshadinglanguage";
version = "1.13.6.1";
version = "1.13.7.0";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenShadingLanguage";
rev = "v${version}";
hash = "sha256-NSnM5/SyVkfZ4SyzRzVJc5O1t4/s2ax0koevRZsQ9q8=";
hash = "sha256-M8B5lnLEnWu0PQx4BKidFHXm4+Xs26EaD2caOA+bZ1k=";
};
cmakeFlags = [

View File

@ -1,13 +1,6 @@
From ef066db7f5cb7f551f88fb218c82fc947e464425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Sun, 3 Jul 2022 14:30:51 +0300
Subject: [PATCH 1/3] Makefile
diff --git a/Makefile b/Makefile
index 60a5a574..904d2db5 100644
--- a/Makefile
+++ b/Makefile
diff --git a/GNUmakefile b/GNUmakefile
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11
errifempty = $(if $(1),$(1),$(error $(2)))
detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))

View File

@ -1,25 +0,0 @@
diff --git a/builder/library.go b/builder/library.go
index 6517355b..b8de1894 100644
--- a/builder/library.go
+++ b/builder/library.go
@@ -142,7 +142,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ
// Note: -fdebug-prefix-map is necessary to make the output archive
// reproducible. Otherwise the temporary directory is stored in the archive
// itself, which varies each run.
- args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir)
+ args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir, "-isystem", "@clang_include@")
cpu := config.CPU()
if cpu != "" {
// X86 has deprecated the -mcpu flag, so we need to use -march instead.
diff --git a/compileopts/config.go b/compileopts/config.go
index 39fc4f2a..8711b5a8 100644
--- a/compileopts/config.go
+++ b/compileopts/config.go
@@ -264,6 +264,7 @@ func (c *Config) CFlags() []string {
for _, flag := range c.Target.CFlags {
cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT")))
}
+ cflags = append([]string{"-isystem", "@clang_include@"}, cflags...)
switch c.Target.Libc {
case "darwin-libSystem":
root := goenv.Get("TINYGOROOT")

View File

@ -1,56 +0,0 @@
From e7357c383188dd735592bd9f2202d2afcfffa39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Sun, 11 Sep 2022 17:08:33 +0300
Subject: [PATCH 3/3] Use out path as build id on darwin
diff --git a/builder/buildid.go b/builder/buildid.go
index e6527700..65cb08e8 100644
--- a/builder/buildid.go
+++ b/builder/buildid.go
@@ -3,8 +3,6 @@ package builder
import (
"bytes"
"debug/elf"
- "debug/macho"
- "encoding/binary"
"fmt"
"io"
"os"
@@ -53,30 +51,9 @@ func ReadBuildID() ([]byte, error) {
return goID, nil
}
case "darwin":
- // Read the LC_UUID load command, which contains the equivalent of a
- // build ID.
- file, err := macho.NewFile(f)
- if err != nil {
- return nil, err
- }
- for _, load := range file.Loads {
- // Unfortunately, the debug/macho package doesn't support the
- // LC_UUID command directly. So we have to read it from
- // macho.LoadBytes.
- load, ok := load.(macho.LoadBytes)
- if !ok {
- continue
- }
- raw := load.Raw()
- command := binary.LittleEndian.Uint32(raw)
- if command != 0x1b {
- // Looking for the LC_UUID load command.
- // LC_UUID is defined here as 0x1b:
- // https://opensource.apple.com/source/xnu/xnu-4570.71.2/EXTERNAL_HEADERS/mach-o/loader.h.auto.html
- continue
- }
- return raw[4:], nil
- }
+ // On darwin, os.Executable() returns broken path in nix build environment
+ // So we are using $out path as build id since its also unique
+ return []byte("OUT_PATH"), nil
default:
// On other platforms (such as Windows) there isn't such a convenient
// build ID. Luckily, Go does have an equivalent of the build ID, which
--
2.37.2

View File

@ -1,12 +0,0 @@
diff --git a/compileopts/config.go b/compileopts/config.go
index 39fc4f2a..fb5d4575 100644
--- a/compileopts/config.go
+++ b/compileopts/config.go
@@ -269,6 +269,7 @@ func (c *Config) CFlags() []string {
root := goenv.Get("TINYGOROOT")
cflags = append(cflags,
"--sysroot="+filepath.Join(root, "lib/macos-minimal-sdk/src"),
+ "-isystem", filepath.Join(root, "lib/macos-minimal-sdk/src/usr/include"), // necessary for Nix
)
case "picolibc":
root := goenv.Get("TINYGOROOT")

View File

@ -4,15 +4,9 @@
, buildGoModule
, fetchFromGitHub
, makeWrapper
, substituteAll
, llvmPackages
, go
, libffi
, zlib
, ncurses
, libxml2
, xar
, wasi-libc
, binaryen
, avrdude
, gdb
@ -30,104 +24,62 @@ let
bootstrapTools = runCommand "tinygo-bootstap-tools" { } ''
mkdir -p $out
ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor}
ln -s ${lib.getBin lld}/bin/ld.lld $out/ld.lld-${llvmMajor}
ln -s ${lib.getBin lld}/bin/wasm-ld $out/wasm-ld-${llvmMajor}
# GDB upstream does not support ARM darwin
${lib.optionalString (!(stdenv.isDarwin && stdenv.isAarch64)) "ln -s ${gdb}/bin/gdb $out/gdb-multiarch" }
'';
in
buildGoModule rec {
pname = "tinygo";
version = "0.30.0";
version = "0.31.1";
src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
sha256 = "sha256-hOccfMKuvTKYKDRcEgTJ8k/c/H+qNDpvotWIqk6p2u8=";
sha256 = "sha256-YocRTgGSyjnQsYd4a2nCQ0vdQi/z2gHPguix5xIkkgc=";
fetchSubmodules = true;
};
vendorHash = "sha256-2q3N6QhfRmwbs4CTWrFWr1wyhf2jPS2ECAn/wrrpXdM=";
vendorHash = "sha256-HZiyAgsTEBQv+Qp0T9RXTV1lkxvIGh7Q45rd45cfvjo=";
patches = [
./0001-Makefile.patch
# clang.cc does not have any paths in the include path.
# For TinyGo, we want to have no include paths, _except_ for the built-in
# Clang header files (things like stdint.h). That's why we use -nostdlibinc.
# So to make Clang work like we want, we will have to manually add this one
# include path.
# We can't use a regular clang command (something like
# llvmPackages.clangUseLLVM) because there are various bugs, see:
# https://github.com/NixOS/nixpkgs/issues/259397
# https://github.com/NixOS/nixpkgs/issues/259386
(substituteAll {
src = ./0002-Add-clang-header-path.patch;
clang_include = "${clang.cc.lib}/lib/clang/${llvmMajor}/include";
})
#TODO(muscaln): Find a better way to fix build ID on darwin
./0003-Use-out-path-as-build-id-on-darwin.patch
./0004-fix-darwin-build.patch
./0001-GNUmakefile.patch
];
nativeCheckInputs = [ binaryen ];
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper lld ];
buildInputs = [ llvm clang.cc ]
++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ];
++ lib.optionals stdenv.isDarwin [ xar ];
doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform);
inherit tinygoTests;
allowGoReference = true;
tags = [ "llvm${llvmMajor}" ];
ldflags = [ "-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo" ];
ldflags = [
"-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo"
"-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${clang.cc.lib}/lib/clang/${llvmMajor}"
];
subPackages = [ "." ];
# Output contains static libraries for different arm cpus
# and stripping could mess up these so only strip the compiler
stripDebugList = [ "bin" ];
postConfigure = lib.optionalString stdenv.isDarwin ''
for i in vendor/tinygo.org/x/go-llvm/llvm_config_darwin*; do
substituteInPlace $i --replace "curses" "ncurses"
done
'';
postPatch = ''
# Copy wasi-libc, symlink seems not working
rm -rf lib/wasi-libc/*
mkdir -p lib/wasi-libc/sysroot/lib/wasm32-wasi lib/wasi-libc/sysroot/include
cp -a ${wasi-libc}/lib/* lib/wasi-libc/sysroot/lib/wasm32-wasi/
cp -a ${wasi-libc.dev}/include/* lib/wasi-libc/sysroot/include/
# Borrow compiler-rt builtins from our source
# See https://github.com/tinygo-org/tinygo/pull/2471
mkdir -p lib/compiler-rt-builtins
cp -a ${compiler-rt.src}/compiler-rt/lib/builtins/* lib/compiler-rt-builtins/
substituteInPlace Makefile \
--replace "\$(TINYGO)" "$(pwd)/build/tinygo" \
--replace "@\$(MD5SUM)" "md5sum" \
substituteInPlace GNUmakefile \
--replace "build/release/tinygo/bin" "$out/bin" \
--replace "build/release/" "$out/share/"
substituteInPlace builder/buildid.go \
--replace "OUT_PATH" "$out"
# TODO: Fix mingw
# Disable windows cross-compile tests
sed -i "/GOOS=windows/d" Makefile
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile \
--replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo"
'';
preBuild = ''
export PATH=${bootstrapTools}:$PATH
export HOME=$TMPDIR
ldflags=("''$ldflags[@]/\"-buildid=\"")
'';
postBuild = ''
@ -135,28 +87,38 @@ buildGoModule rec {
mkdir -p build
mv $GOPATH/bin/tinygo build/tinygo
# Build our own custom wasi-libc.
# This is necessary because we modify the build a bit for our needs (disable
# heap, enable debug symbols, etc).
make wasi-libc \
CLANG="${lib.getBin clang.cc}/bin/clang -resource-dir ${clang.cc.lib}/lib/clang/${llvmMajor}" \
LLVM_AR=${lib.getBin llvm}/bin/llvm-ar \
LLVM_NM=${lib.getBin llvm}/bin/llvm-nm
make gen-device -j $NIX_BUILD_CORES
export TINYGOROOT=$(pwd)
'';
checkPhase = lib.optionalString (tinygoTests != [ ] && tinygoTests != null) ''
make ''${tinygoTests[@]} XTENSA=0
make ''${tinygoTests[@]} TINYGO="$(pwd)/build/tinygo" MD5SUM=md5sum XTENSA=0
'';
# GDB upstream does not support ARM darwin
runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ]
++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ];
installPhase = ''
runHook preInstall
make build/release
wrapProgram $out/bin/tinygo \
--prefix PATH : ${lib.makeBinPath [ go avrdude openocd binaryen ]}:${bootstrapTools}
--prefix PATH : ${lib.makeBinPath runtimeDeps }
runHook postInstall
'';
disallowedReferences = [ wasi-libc ];
meta = with lib; {
homepage = "https://tinygo.org/";
description = "Go compiler for small places";

View File

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "4.2.5";
version = "4.2.6";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-zCaN0F6a8qkZkOmHMU0D70KaY4H8pUXElJbyvOCjogc=";
hash = "sha256-FSplJAVdy/b0HXvW1qny052I7Fm9EA83/XqmgEvneeg=";
};
cargoHash = "sha256-ugysqLQlnSzm0W4zW6LPSn6KjwpAtJZGEkzk/nWahWg=";
cargoHash = "sha256-OYHPudXGsDLVx6XKTsJTxqG5cbOAD25sd5KJDyU9lvY=";
nativeBuildInputs = [
rustPlatform.bindgenHook

View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/encukou/py3c";
description = "Python 2/3 compatibility layer for C extensions";
license = licenses.mit;
maintainers = with maintainers; [ ajs124 dotlambda ];
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amd-blis";
version = "4.1";
version = "4.2";
src = fetchFromGitHub {
owner = "amd";
repo = "blis";
rev = version;
hash = "sha256-1vd4uBg/+Vufqsr+MnAWSUW/THkribHNSMeq1/is8K4=";
hash = "sha256-mLigzaA2S7qFCQT8UWC6bHWAvBjgpqvtgabPyFWBYT0=";
};
inherit blas64;

View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "amd-libflame";
version = "4.1";
version = "4.2";
src = fetchFromGitHub {
owner = "amd";
repo = "libflame";
rev = version;
hash = "sha256-SZk11oOAnvn1vb7ucX6U9b0YtAJNxl3tQu4ExHpwwoo=";
hash = "sha256-eiH2eq+nKUjlB1bZTZNRW1+efCHZ68UOSFy0NpcY1FI=";
};
postPatch = ''

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "suitesparse-graphblas";
version = "9.0.2";
version = "9.0.3";
outputs = [ "out" "dev" ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "DrTimothyAldenDavis";
repo = "GraphBLAS";
rev = "v${version}";
hash = "sha256-wPg5A1lwtRPDO5gPbllEFkRJFRIhkqqaVd4CBdPavKE=";
hash = "sha256-qRRrxMshLLEltCzXFv/j6NgRi6x1SHlAuKG5NfLiBFs=";
};
nativeBuildInputs = [

View File

@ -1,21 +1,49 @@
{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler ? null
, core_unix ? null, owee, ppx_jane, shell ? null }:
{ lib
, fetchFromGitHub
, buildDunePackage
, ocaml-crunch
, angstrom
, async
, cohttp
, cohttp_static_handler ? null
, core
, core_unix ? null
, fzf
, owee
, ppx_jane
, re
, shell ? null
}:
buildDunePackage rec {
pname = "magic-trace";
version = "1.1.0";
version = "1.2.1";
minimalOCamlVersion = "4.12";
duneVersion = "3";
src = fetchFromGitHub {
owner = "janestreet";
repo = "magic-trace";
rev = "v${version}";
sha256 = "sha256-615AOkrbQI6vRosA5Kz3Epipe9f9+Gs9+g3bVl5gzBY=";
hash = "sha256-/9TDjCG/06mhGyqbjAdUmk6fcaq9fNDqVSw51w5EEy4=";
};
buildInputs = [ async cohttp_static_handler core_unix owee ppx_jane shell ];
nativeBuildInputs = [
ocaml-crunch
];
buildInputs = [
angstrom
async
cohttp
cohttp_static_handler
core
core_unix
fzf
owee
ppx_jane
re
shell
];
meta = with lib; {
description =

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aioapcaccess";
version = "0.4.2";
version = "0.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "yuxincs";
repo = "aioapcaccess";
rev = "refs/tags/v${version}";
hash = "sha256-Ig9aQduM9wby3DzPjvbubihopwhdMXHovMo3Id47mRk=";
hash = "sha256-nI8hfHfSLMOKPcG5idYqqa/msJuR/Xt+JmgzdftlN28=";
};
nativeBuildInputs = [

View File

@ -1,12 +1,14 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, numpy
, opencv4
, pyyaml
, qudida
, scikit-image
, scipy
, deepdiff
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
@ -14,14 +16,14 @@
buildPythonPackage rec {
pname = "albumentations";
version = "1.3.1";
format = "setuptools";
version = "1.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-pqODiP5UbFaAcejIL0FEmOhsntA8CLWOeoizHPeiRMY=";
hash = "sha256-ZJ+KFIlveIs1bsxwCDxPuRvtq0/04rOa0heoJOGJ3tA=";
};
nativeBuildInputs = [
@ -32,7 +34,11 @@ buildPythonPackage rec {
"opencv-python"
];
propagatedBuildInputs = [
build-system = [
setuptools
];
dependencies = [
numpy
opencv4
pyyaml
@ -42,6 +48,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
deepdiff
pytestCheckHook
];

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "1.7.2";
version = "1.7.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CeFZspAI5sjpPX/8PBXUGcC7rkFiBAX48tNDK3Ki6b8=";
hash = "sha256-MeKmOUB7uNJmJJ/Adf8xfp00/1lRxuFr/u/dwq9f6Ew=";
};
nativeBuildInputs = [

View File

@ -15,11 +15,12 @@
, pythonOlder
, setuptools
, testfixtures
, typing-extensions
}:
buildPythonPackage rec {
pname = "approvaltests";
version = "11.0.0";
version = "11.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -28,7 +29,7 @@ buildPythonPackage rec {
owner = "approvals";
repo = "ApprovalTests.Python";
rev = "refs/tags/v${version}";
hash = "sha256-Ep95niYin3urtiMFSVY792zpFAcu6MwQN9DA/IJLSQQ=";
hash = "sha256-F03qctswG0/y2ZCdHCacHsMiBZFTmEEegYXIIB2UPlc=";
};
nativeBuildInputs = [
@ -45,6 +46,7 @@ buildPythonPackage rec {
pyperclip
pytest
testfixtures
typing-extensions
];
nativeCheckInputs = [

View File

@ -5,24 +5,29 @@
, fetchPypi
, isodate
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "5.0.0";
format = "setuptools";
version = "6.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-WX/lFsU8qGg3Mg5bk+U0SBdR6cQpjtfmbX02Hr8uz7o=";
hash = "sha256-0B+K8u9M/z3edwlc8LNR8DeqV9y6vIVCmevoUIWN0YM=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
isodate
azure-common
azure-mgmt-core
isodate
];
# has no tests

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "cement";
version = "3.0.8";
version = "3.0.10";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-rRGmlGZeKtKEV8VgSU9PjDaiX8WOUA1gip2R4E4dMJM=";
hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU=";
};
# Disable test tests since they depend on a memcached server running on

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, pyopenssl
, tldextract
, pytestCheckHook
@ -10,7 +11,7 @@
buildPythonPackage rec {
pname = "certauth";
version = "1.3.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,9 +25,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "--cov certauth " ""
--replace-fail "--cov certauth " ""
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
pyopenssl
tldextract
@ -41,6 +46,9 @@ buildPythonPackage rec {
];
disabledTests = [
# https://github.com/ikreymer/certauth/issues/23
"test_ca_cert_in_mem"
"test_custom_not_before_not_after"
# Tests want to download Public Suffix List
"test_file_wildcard"
"test_file_wildcard_subdomains"

View File

@ -11,18 +11,18 @@
buildPythonPackage rec {
pname = "clarabel";
version = "0.7.0";
version = "0.7.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-udpW9SKAaoR/Ps4I9fIfq3UG7sMUiyJEYZDeUgbdHm8=";
hash = "sha256-owqxNfR1xbx4Mp/X31dSkRVeYFW8rwISTrYQuK0XY5Y=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-R/o12m2UqKte4H1pvW9DN0YPDhgNIxt0mXrfBDMzcwM=";
hash = "sha256-Tg9K66WIIAZyua8QlKrlUnpRJRmuxe7ihIr2Vqg79NQ=";
};
nativeBuildInputs = with rustPlatform; [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "cloup";
version = "3.0.4";
version = "3.0.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ZYER4vSbglaoItrF+gIFv2QQn978Q185kjSQoysT7Ak=";
hash = "sha256-ySsmHHu34TAEkw8/tLPtrY3i0fEplNzdvgW8IZkEQ8U=";
};
nativeBuildInputs = [

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "django-modelcluster";
version = "6.2.1";
version = "6.3";
format = "setuptools";
disabled = pythonOlder "3.5";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "wagtail";
repo = "django-modelcluster";
rev = "refs/tags/v${version}";
hash = "sha256-y2jGSZvTeSnpWDFJ+aNGofTEtMMlY9TrXZjQeET5OhY=";
hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU=";
};
propagatedBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "django";
version = "3.2.24";
version = "3.2.25";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "Django";
inherit version;
hash = "sha256-qu6fsPtOvUMRUgiHrS4zMT02iEZgf4KpoO1GHNTDWxg=";
hash = "sha256-fKOKeGVK7nI3hZTWPlFjbAS44oV09VBd/2MIlbVHJ3c=";
};
patches = [

View File

@ -42,14 +42,14 @@
buildPythonPackage rec {
pname = "Django";
version = "5.0.2";
version = "5.0.3";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
hash = "sha256-tbsdEbJRil+RNyooLyRmL1j2Z0lmawooarBXAp9ygIA=";
hash = "sha256-X7N1gNz0omL5JYwfQ3OBmqzKkGQx9QXkaI4386mRld8=";
};
patches = [

Some files were not shown because too many files have changed in this diff Show More