mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 01:04:06 +01:00
Merge master into staging-nixos
This commit is contained in:
commit
a97d96fbf0
123 changed files with 1906 additions and 1992 deletions
2
.github/workflows/periodic-merge.yml
vendored
2
.github/workflows/periodic-merge.yml
vendored
|
|
@ -65,5 +65,5 @@ jobs:
|
|||
with:
|
||||
issue-number: 105153
|
||||
body: |
|
||||
Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
||||
Periodic merge from `${{ inputs.from }}` into `[${{ inputs.into }}](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }})` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
# Extract attributes that changed from by-name paths.
|
||||
# This allows pinging reviewers for pure refactors.
|
||||
touchedattrs = lib.pipe changedpaths [
|
||||
(lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed))
|
||||
(lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md"))
|
||||
(map (lib.splitString "/"))
|
||||
(map (path: lib.elemAt path 3))
|
||||
lib.unique
|
||||
|
|
|
|||
|
|
@ -74,6 +74,8 @@
|
|||
|
||||
- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
|
||||
|
||||
- `mercure` has been update to `0.21.4` (or later). Version [0.21.0](https://github.com/dunglas/mercure/releases/v0.21.0) and [0.21.2](https://github.com/dunglas/mercure/releases/tag/v0.21.2) introduce breaking changes to the package.
|
||||
|
||||
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
|
||||
|
||||
- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
|
||||
|
|
|
|||
|
|
@ -105,12 +105,14 @@ let
|
|||
# network
|
||||
network = callLibs ./network;
|
||||
|
||||
# flakes
|
||||
flakes = callLibs ./flakes.nix;
|
||||
|
||||
inherit (builtins)
|
||||
getContext
|
||||
hasContext
|
||||
convertHash
|
||||
hashString
|
||||
hasFile
|
||||
parseDrvName
|
||||
placeholder
|
||||
fromJSON
|
||||
|
|
@ -391,6 +393,8 @@ let
|
|||
toInt
|
||||
toIntBase10
|
||||
fileContents
|
||||
appendContext
|
||||
unsafeDiscardStringContext
|
||||
;
|
||||
inherit (self.stringsWithDeps)
|
||||
textClosureList
|
||||
|
|
@ -415,7 +419,13 @@ let
|
|||
renameCrossIndexTo
|
||||
mapCrossIndex
|
||||
;
|
||||
inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
|
||||
inherit (self.derivations)
|
||||
lazyDerivation
|
||||
optionalDrvAttr
|
||||
warnOnInstantiate
|
||||
addDrvOutputDependencies
|
||||
unsafeDiscardOutputDependency
|
||||
;
|
||||
inherit (self.generators) mkLuaInline;
|
||||
inherit (self.meta)
|
||||
addMetaAttrs
|
||||
|
|
@ -443,6 +453,9 @@ let
|
|||
dirOf
|
||||
isPath
|
||||
packagesFromDirectoryRecursive
|
||||
hashFile
|
||||
readDir
|
||||
readFileType
|
||||
;
|
||||
inherit (self.sources)
|
||||
cleanSourceFilter
|
||||
|
|
@ -593,6 +606,10 @@ let
|
|||
inherit (self.network.ipv6)
|
||||
mkEUI64Suffix
|
||||
;
|
||||
inherit (self.flakes)
|
||||
parseFlakeRef
|
||||
flakeRefToString
|
||||
;
|
||||
}
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -21,6 +21,11 @@ let
|
|||
if pkg ? meta.position && isString pkg.meta.position then "${prefix}${pkg.meta.position}" else "";
|
||||
in
|
||||
{
|
||||
inherit (builtins)
|
||||
addDrvOutputDependencies
|
||||
unsafeDiscardOutputDependency
|
||||
;
|
||||
|
||||
/**
|
||||
Restrict a derivation to a predictable set of attribute names, so
|
||||
that the returned attrset is not strict in the actual derivation,
|
||||
|
|
|
|||
|
|
@ -31,6 +31,12 @@ in
|
|||
isPath
|
||||
;
|
||||
|
||||
inherit (builtins)
|
||||
readDir
|
||||
readFileType
|
||||
hashFile
|
||||
;
|
||||
|
||||
/**
|
||||
The type of a path. The path needs to exist and be accessible.
|
||||
The result is either `"directory"` for a directory, `"regular"` for a
|
||||
|
|
|
|||
12
lib/flakes.nix
Normal file
12
lib/flakes.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
/**
|
||||
Flake operations.
|
||||
*/
|
||||
{ lib }:
|
||||
{
|
||||
|
||||
inherit (builtins)
|
||||
parseFlakeRef
|
||||
flakeRefToString
|
||||
;
|
||||
|
||||
}
|
||||
|
|
@ -39,6 +39,7 @@ rec {
|
|||
toJSON
|
||||
typeOf
|
||||
unsafeDiscardStringContext
|
||||
appendContext
|
||||
;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -15919,6 +15919,12 @@
|
|||
{ fingerprint = "9C68 989F ECF9 8993 3225 96DD 970A 6794 990C 52AE"; }
|
||||
];
|
||||
};
|
||||
maj0e = {
|
||||
email = "contact@markusjoerg.com";
|
||||
github = "maj0e";
|
||||
githubId = 57637846;
|
||||
name = "Markus Jörg";
|
||||
};
|
||||
majesticmullet = {
|
||||
email = "hoccthomas@gmail.com.au";
|
||||
github = "MajesticMullet";
|
||||
|
|
@ -20752,6 +20758,12 @@
|
|||
githubId = 20472367;
|
||||
name = "Peter Hebden";
|
||||
};
|
||||
pixel-87 = {
|
||||
email = "edwardoliverthomas@gmail.com";
|
||||
github = "pixel-87";
|
||||
githubId = 149434768;
|
||||
name = "Ed Thomas";
|
||||
};
|
||||
pixelsergey = {
|
||||
email = "sergey.ichtchenko@gmail.com";
|
||||
github = "PixelSergey";
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
- [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
|
||||
|
||||
- [rqbit](https://github.com/ikatson/rqbit), a bittorrent client written in Rust. It has HTTP API and Web UI, and can be used as a library. Available as [services.rqbit](#opt-services.rqbit.enable).
|
||||
|
||||
- [Tailscale Serve](https://tailscale.com/kb/1552/tailscale-services), configure Tailscale Serve for exposing local services to your tailnet. Available as [services.tailscale.serve](#opt-services.tailscale.serve.enable).
|
||||
|
||||
- [qui](https://github.com/autobrr/qui), a modern alternative webUI for qBittorrent, with multi-instance support. Written in Go/React. Available as [services.qui](#opt-services.qui.enable).
|
||||
|
|
|
|||
|
|
@ -1556,6 +1556,7 @@
|
|||
./services/torrent/peerflix.nix
|
||||
./services/torrent/qbittorrent.nix
|
||||
./services/torrent/qui.nix
|
||||
./services/torrent/rqbit.nix
|
||||
./services/torrent/rtorrent.nix
|
||||
./services/torrent/torrentstream.nix
|
||||
./services/torrent/transmission.nix
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ in
|
|||
Whether interactive shells should show which Nix package (if
|
||||
any) provides a missing command.
|
||||
|
||||
Requires nix-channels to be set and downloaded (sudo nix-channels --update.)
|
||||
Requires nix-channels to be set and downloaded (sudo nix-channel --update.)
|
||||
|
||||
See also nix-index and nix-index-database as an alternative for flakes-based systems.
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ if (! -e $dbPath) {
|
|||
print STDERR "This tool requires nix-channels to generate the database for the `nixos` channel.\n";
|
||||
print STDERR "\n";
|
||||
print STDERR "If you are using nix-channels you can run:\n";
|
||||
print STDERR " sudo nix-channels --update\n";
|
||||
print STDERR " sudo nix-channel --update\n";
|
||||
print STDERR "\n";
|
||||
print STDERR "If you are using flakes, see nix-index and nix-index-database.\n";
|
||||
print STDERR "\n";
|
||||
|
|
|
|||
151
nixos/modules/services/torrent/rqbit.nix
Normal file
151
nixos/modules/services/torrent/rqbit.nix
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
mkEnableOption
|
||||
mkOption
|
||||
types
|
||||
mkPackageOption
|
||||
mkIf
|
||||
;
|
||||
|
||||
cfg = config.services.rqbit;
|
||||
stateDir = "/var/lib/rqbit";
|
||||
defaultDownloadDir = "${stateDir}/downloads";
|
||||
in
|
||||
{
|
||||
options.services.rqbit = {
|
||||
enable = mkEnableOption "rqbit BitTorrent daemon";
|
||||
|
||||
package = mkPackageOption pkgs "rqbit" { };
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "rqbit";
|
||||
description = "User account under which rqbit runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "rqbit";
|
||||
description = "Group account under which rqbit runs.";
|
||||
};
|
||||
|
||||
downloadDir = mkOption {
|
||||
type = types.path;
|
||||
default = defaultDownloadDir;
|
||||
example = "/mnt/storage/torrents";
|
||||
description = "Directory where to download torrents.";
|
||||
};
|
||||
|
||||
httpPort = mkOption {
|
||||
type = types.port;
|
||||
default = 3030;
|
||||
description = "The listen port for the HTTP API.";
|
||||
};
|
||||
|
||||
httpHost = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
example = "0.0.0.0";
|
||||
description = "The listen host for the HTTP API.";
|
||||
};
|
||||
|
||||
peerPort = mkOption {
|
||||
type = types.port;
|
||||
default = 4240;
|
||||
description = "The port to listen for incoming BitTorrent peer connections (TCP and uTP).";
|
||||
};
|
||||
|
||||
openFirewall = mkEnableOption "opening of the HTTP and Peer ports in the firewall";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.rqbit = {
|
||||
description = "rqbit BitTorrent Service";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment = {
|
||||
HOME = stateDir;
|
||||
RQBIT_HTTP_API_LISTEN_ADDR = "${
|
||||
if (lib.hasInfix ":" cfg.httpHost) then "[${cfg.httpHost}]" else cfg.httpHost
|
||||
}:${toString cfg.httpPort}";
|
||||
RQBIT_LISTEN_PORT = toString cfg.peerPort;
|
||||
RQBIT_SESSION_PERSISTENCE_LOCATION = stateDir;
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe cfg.package} server start ${cfg.downloadDir}";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
||||
StateDirectory = "rqbit";
|
||||
StateDirectoryMode = "0750";
|
||||
|
||||
# systemd-analyze security rqbit
|
||||
ReadWritePaths = mkIf (cfg.downloadDir != defaultDownloadDir) [ cfg.downloadDir ];
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "read-only";
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
PrivateUsers = true;
|
||||
RemoveIPC = true;
|
||||
CapabilityBoundingSet = "";
|
||||
NoNewPrivileges = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectClock = true;
|
||||
ProtectHostname = true;
|
||||
RestrictNamespaces = true;
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"@network-io"
|
||||
"@file-system"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
SystemCallArchitectures = "native";
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
LockPersonality = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
UMask = "0027";
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
users = mkIf (cfg.user == "rqbit") {
|
||||
rqbit = {
|
||||
inherit (cfg) group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
groups = mkIf (cfg.group == "rqbit") { rqbit = { }; };
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [
|
||||
cfg.httpPort
|
||||
cfg.peerPort
|
||||
];
|
||||
allowedUDPPorts = [ cfg.peerPort ];
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ CodedNil ];
|
||||
}
|
||||
|
|
@ -1388,6 +1388,7 @@ in
|
|||
rosenpass = runTest ./rosenpass.nix;
|
||||
roundcube = runTest ./roundcube.nix;
|
||||
routinator = handleTest ./routinator.nix { };
|
||||
rqbit = handleTest ./rqbit.nix { };
|
||||
rshim = handleTest ./rshim.nix { };
|
||||
rspamd = handleTest ./rspamd.nix { };
|
||||
rspamd-trainer = runTest ./rspamd-trainer.nix;
|
||||
|
|
|
|||
30
nixos/tests/rqbit.nix
Normal file
30
nixos/tests/rqbit.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
import ./make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
port = 3030;
|
||||
in
|
||||
{
|
||||
name = "rqbit";
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ CodedNil ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.rqbit = {
|
||||
httpPort = port;
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = /* python */ ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("rqbit.service")
|
||||
machine.wait_for_open_port(${toString port})
|
||||
|
||||
machine.succeed("curl --fail http://localhost:${toString port}")
|
||||
'';
|
||||
}
|
||||
)
|
||||
|
|
@ -92,6 +92,7 @@ let
|
|||
# TODO(@Ericson2314) Make unconditional, or optional but always true by
|
||||
# default.
|
||||
targetPrefix = optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-");
|
||||
exeSuffix = stdenvNoCC.hostPlatform.extensions.executable;
|
||||
|
||||
bintoolsVersion = getVersion bintools;
|
||||
bintoolsName = removePrefix targetPrefix (getName bintools);
|
||||
|
|
@ -257,17 +258,17 @@ stdenvNoCC.mkDerivation {
|
|||
+ ''
|
||||
for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line \
|
||||
ranlib readelf elfedit dlltool dllwrap windmc windres; do
|
||||
if [ -e $ldPath/${targetPrefix}''${binary} ]; then
|
||||
ln -s $ldPath/${targetPrefix}''${binary} $out/bin/${targetPrefix}''${binary}
|
||||
if [ -e $ldPath/${targetPrefix}''${binary}${exeSuffix} ]; then
|
||||
ln -s $ldPath/${targetPrefix}''${binary}${exeSuffix} $out/bin/${targetPrefix}''${binary}${exeSuffix}
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -e ''${ld:-$ldPath/${targetPrefix}ld} ]; then
|
||||
wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}
|
||||
if [ -e ''${ld:-$ldPath/${targetPrefix}ld}${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld}${exeSuffix}
|
||||
fi
|
||||
|
||||
for variant in $ldPath/${targetPrefix}ld.*; do
|
||||
basename=$(basename "$variant")
|
||||
for variant in $ldPath/${targetPrefix}ld.*${exeSuffix}; do
|
||||
basename=$(basename "${if exeSuffix != "" then "\${variant%${exeSuffix}}" else "$variant"}")
|
||||
wrap $basename ${./ld-wrapper.sh} $variant
|
||||
done
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ let
|
|||
#
|
||||
# TODO(@Ericson2314) Make unconditional, or optional but always true by default.
|
||||
targetPrefix = optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-");
|
||||
exeSuffix = stdenvNoCC.hostPlatform.extensions.executable;
|
||||
|
||||
ccVersion = getVersion cc;
|
||||
ccName = removePrefix targetPrefix (getName cc);
|
||||
|
|
@ -524,34 +525,34 @@ stdenvNoCC.mkDerivation {
|
|||
export named_cc=${targetPrefix}cc
|
||||
export named_cxx=${targetPrefix}c++
|
||||
|
||||
if [ -e $ccPath/${targetPrefix}gcc ]; then
|
||||
wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc
|
||||
if [ -e $ccPath/${targetPrefix}gcc${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc${exeSuffix}
|
||||
ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc
|
||||
export named_cc=${targetPrefix}gcc
|
||||
export named_cxx=${targetPrefix}g++
|
||||
elif [ -e $ccPath/clang ]; then
|
||||
wrap ${targetPrefix}clang $wrapper $ccPath/clang
|
||||
elif [ -e $ccPath/clang${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}clang $wrapper $ccPath/clang${exeSuffix}
|
||||
ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc
|
||||
export named_cc=${targetPrefix}clang
|
||||
export named_cxx=${targetPrefix}clang++
|
||||
elif [ -e $ccPath/arocc ]; then
|
||||
wrap ${targetPrefix}arocc $wrapper $ccPath/arocc
|
||||
elif [ -e $ccPath/arocc${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}arocc $wrapper $ccPath/arocc${exeSuffix}
|
||||
ln -s ${targetPrefix}arocc $out/bin/${targetPrefix}cc
|
||||
export named_cc=${targetPrefix}arocc
|
||||
fi
|
||||
|
||||
if [ -e $ccPath/${targetPrefix}g++ ]; then
|
||||
wrap ${targetPrefix}g++ $wrapper $ccPath/${targetPrefix}g++
|
||||
if [ -e $ccPath/${targetPrefix}g++${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}g++ $wrapper $ccPath/${targetPrefix}g++${exeSuffix}
|
||||
ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++
|
||||
elif [ -e $ccPath/clang++ ]; then
|
||||
wrap ${targetPrefix}clang++ $wrapper $ccPath/clang++
|
||||
elif [ -e $ccPath/clang++${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}clang++ $wrapper $ccPath/clang++${exeSuffix}
|
||||
ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++
|
||||
fi
|
||||
|
||||
if [ -e $ccPath/${targetPrefix}cpp ]; then
|
||||
wrap ${targetPrefix}cpp $wrapper $ccPath/${targetPrefix}cpp
|
||||
elif [ -e $ccPath/cpp ]; then
|
||||
wrap ${targetPrefix}cpp $wrapper $ccPath/cpp
|
||||
if [ -e $ccPath/${targetPrefix}cpp${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}cpp $wrapper $ccPath/${targetPrefix}cpp${exeSuffix}
|
||||
elif [ -e $ccPath/cpp${exeSuffix} ]; then
|
||||
wrap ${targetPrefix}cpp $wrapper $ccPath/cpp${exeSuffix}
|
||||
fi
|
||||
''
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
let
|
||||
appName = "AeroSpace.app";
|
||||
version = "0.20.0-Beta";
|
||||
version = "0.20.2-Beta";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "aerospace";
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip";
|
||||
sha256 = "sha256-bPcVgTPvskit0/LeqmWoOOnlwwyzPoa48P8Vooaqlig=";
|
||||
sha256 = "sha256-PyWHtM38XPNkkEZ0kACPia0doR46FRpmSoNdsOhU4uw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
--- a/src/argononed.c
|
||||
+++ b/src/argononed.c
|
||||
@@ -783,13 +783,13 @@
|
||||
{
|
||||
log_message(LOG_DEBUG, "EXEC REBOOT");
|
||||
sync();
|
||||
- system("/sbin/reboot");
|
||||
+ system("/run/current-system/sw/bin/reboot");
|
||||
}
|
||||
if (count >= 39 && count <= 41)
|
||||
{
|
||||
log_message(LOG_DEBUG, "EXEC SHUTDOWN");
|
||||
sync();
|
||||
- system("/sbin/poweroff");
|
||||
+ system("/run/current-system/sw/bin/poweroff");
|
||||
}
|
||||
#else
|
||||
log_message(LOG_INFO,"Daemon Ready");
|
||||
@@ -665,13 +665,13 @@
|
||||
{
|
||||
log_message(LOG_DEBUG, "EXEC REBOOT");
|
||||
sync();
|
||||
- system("/sbin/reboot");
|
||||
+ system("reboot");
|
||||
}
|
||||
if (count >= 39 && count <= 41)
|
||||
{
|
||||
log_message(LOG_DEBUG, "EXEC SHUTDOWN");
|
||||
sync();
|
||||
- system("/sbin/poweroff");
|
||||
+ system("poweroff");
|
||||
}
|
||||
} else {
|
||||
log_message(LOG_INFO + LOG_BOLD,"Daemon Ready");
|
||||
|
|
|
|||
|
|
@ -5,16 +5,15 @@
|
|||
dtc,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "argononed";
|
||||
version = "unstable-2022-03-26";
|
||||
version = "0.4.1-unstable-2025-12-26";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "DarkElvenAngel";
|
||||
repo = "argononed";
|
||||
rev = "97c4fa07fc2c09ffc3bd86e0f6319d50fa639578";
|
||||
hash = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ=";
|
||||
rev = "34d70b3bb1b2a8ba4b146ba7d9962dd0d925e67e";
|
||||
hash = "sha256-f7YGoky4C5P/Iyez3kuLEKU/yWKZ4Dh6Cy//PAKMYuU=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-hardcoded-reboot-poweroff-paths.patch ];
|
||||
|
|
|
|||
|
|
@ -9,20 +9,20 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "audible-cli";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkb79";
|
||||
repo = "audible-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DGOOMjP6dxIwbIhzRKf0+oy/2Cs+00tpwHkcmrukatw=";
|
||||
hash = "sha256-ckI6nZUggIMvjJtN1zWXvTlVdiog0uJy6YR110A+JxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
with python3Packages;
|
||||
[
|
||||
setuptools
|
||||
hatchling
|
||||
]
|
||||
++ [
|
||||
addBinToPathHook
|
||||
|
|
@ -37,7 +37,6 @@ python3Packages.buildPythonApplication rec {
|
|||
packaging
|
||||
pillow
|
||||
questionary
|
||||
setuptools
|
||||
tabulate
|
||||
toml
|
||||
tqdm
|
||||
|
|
@ -50,7 +49,6 @@ python3Packages.buildPythonApplication rec {
|
|||
postInstall = ''
|
||||
installShellCompletion --cmd audible \
|
||||
--bash <(source utils/code_completion/audible-complete-bash.sh) \
|
||||
--fish <(source utils/code_completion/audible-complete-zsh-fish.sh) \
|
||||
--zsh <(source utils/code_completion/audible-complete-zsh-fish.sh)
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bazaar";
|
||||
version = "0.7.3";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kolunmi";
|
||||
repo = "bazaar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-T0HQ1bjH2nd9+BJAvhSNcpYp25Jt0sNZxKeTY7EfsSw=";
|
||||
hash = "sha256-c6mAWnX0iKXJqOxe/kgUqmXXVKO7ZEI+vKoYLKOuNos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,32 +3,39 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
makeWrapper,
|
||||
sdl2-compat,
|
||||
vulkan-loader,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bstone";
|
||||
version = "1.2.16";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bibendovsky";
|
||||
repo = "bstone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6BNIMBbLBcQoVx5lnUz14viAvBcFjoZLY8c30EgcvKQ=";
|
||||
hash = "sha256-D0f4DmVv2Bo3cwCUuo3LsXNWFR16rirpvSnAS2C6YEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sdl2-compat
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/{bin,share/bibendovsky/bstone}
|
||||
mv $out/bstone $out/bin
|
||||
mv $out/*.txt $out/share/bibendovsky/bstone
|
||||
|
||||
wrapProgram $out/bin/bstone \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,34 +1,35 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libunwind,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bugstalker";
|
||||
version = "0.3.1";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godzie44";
|
||||
repo = "BugStalker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-c3NyYDz+Ha5jHTpXLw9xsY+h0NjW9Uvpyn2PStmahKA=";
|
||||
hash = "sha256-9l6IVQBjZkpSS28ai/d27JUPBWj2Q17RVhsFrrI45TM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/FSV/avsg7kbgtinmKBb0+gemLFZdSE+A+tfLvtfNas=";
|
||||
|
||||
buildInputs = [ libunwind ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
cargoHash = "sha256-+VvKWY9CqUUkDKzG2nLG9ibkE6xwP3StTzlovBZH8O8=";
|
||||
|
||||
# Tests require rustup.
|
||||
doCheck = false;
|
||||
|
||||
nativeInstallCheckHook = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Rust debugger for Linux x86-64";
|
||||
homepage = "https://github.com/godzie44/BugStalker";
|
||||
changelog = "https://github.com/godzie44/BugStalker/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jacg ];
|
||||
mainProgram = "bs";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "capacities";
|
||||
version = "1.52.6";
|
||||
version = "1.57.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20250519011655/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/capacities-${version}.AppImage";
|
||||
hash = "sha256-M5K2TxrB2Ut/wYKasl8EqbzLjFJrqjWfPIJTZV4fi4s=";
|
||||
url = "https://web.archive.org/web/20260110164323/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/Capacities-1.57.24.AppImage";
|
||||
hash = "sha256-BWan10ItF/hKEMGG/m32QgjySLReqJnrtq5z0k9oYcA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
@ -32,7 +32,7 @@ appimageTools.wrapType2 {
|
|||
extraInstallCommands = ''
|
||||
source "${makeWrapper}/nix-support/setup-hook"
|
||||
wrapProgram $out/bin/capacities \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
--add-flags "--ozone-platform-hint=auto"
|
||||
|
||||
# Check for required desktop file
|
||||
if [ ! -f ${appimageContents}/capacities.desktop ]; then
|
||||
|
|
@ -41,6 +41,8 @@ appimageTools.wrapType2 {
|
|||
else
|
||||
# Install and modify the desktop file
|
||||
install -m 444 -D ${appimageContents}/capacities.desktop $out/share/applications/capacities.desktop
|
||||
substituteInPlace $out/share/applications/capacities.desktop \
|
||||
--replace-fail "Exec=AppRun" "Exec=capacities"
|
||||
fi
|
||||
|
||||
# Check for required icon file
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-pgo";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kobzol";
|
||||
repo = "cargo-pgo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FmZllibhesZY/8kIMnx4VfQrYF6+/cai7Gozda/3bMY=";
|
||||
hash = "sha256-kYdEFUifpBlbEcFnDELu8OwvS46eeJQSU/6VyLQD2mk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uOwWCSXxxnMCFS0+aFPUHSiSWSwNZPtL8NJVCCCDzAc=";
|
||||
cargoHash = "sha256-sY4UUGbTzw5dlALzQ6Iyo3hxB3Qni4infZRexHcle3I=";
|
||||
|
||||
# Integration tests do not run in Nix build environment due to needing to
|
||||
# create and build Cargo workspaces.
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.45.0";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = "cargo-semver-checks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sDx449IXsFUeNL7rXbGC+HUshwqcbpjvGwl0WIJZmwo=";
|
||||
hash = "sha256-y2tkTPctit5rx6OyohPPVo117sGICg6UEDg7RWFmtMA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-meF1qnISB60JXKZyYfnwE2LywGqKEVgZbwzZQEZ1Cmc=";
|
||||
cargoHash = "sha256-lP4yXCuJ89NqUBZR6zgGi5B570y+5IaabWyzd9qqa3o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfv";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cfv-project";
|
||||
repo = "cfv";
|
||||
tag = "v${version}";
|
||||
sha256 = "1wxf30gsijsdvhv5scgkq0bqi8qi4dgs9dwppdrca5wxgy7a8sn5";
|
||||
sha256 = "sha256-vKlnW6Z0Rg2bptU5fxIKDaOY2b+WY/fgaYZQu5tBU44=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -3,22 +3,23 @@
|
|||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
pandoc,
|
||||
go,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "checkmake";
|
||||
version = "0.2.2";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrtazz";
|
||||
owner = "checkmake";
|
||||
repo = "checkmake";
|
||||
tag = version;
|
||||
hash = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W+4bKERQL4nsPxrcCP19uYAwSw+tK9mAQp/fufzYcYg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
vendorHash = "sha256-Iv3MFhHnwDLIuUH7G6NYyQUSAaivBYqYDWephHnBIho=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -28,12 +29,14 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.version=${version}"
|
||||
"-X=main.version=${finalAttrs.version}"
|
||||
"-X=main.buildTime=1970-01-01T00:00:00Z"
|
||||
"-X=main.builder=nixpkgs"
|
||||
"-X=main.goversion=go${go.version}"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace man/man1/checkmake.1.md \
|
||||
--replace REPLACE_DATE 1970-01-01T00:00:00Z
|
||||
|
|
@ -48,14 +51,14 @@ buildGoModule rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
description = "Experimental tool for linting and checking Makefiles";
|
||||
description = "Linter and analyzer for Makefiles";
|
||||
mainProgram = "checkmake";
|
||||
homepage = "https://github.com/mrtazz/checkmake";
|
||||
changelog = "https://github.com/mrtazz/checkmake/releases/tag/${src.rev}";
|
||||
homepage = "https://github.com/checkmake/checkmake";
|
||||
changelog = "https://github.com/checkmake/checkmake/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
longDescription = ''
|
||||
checkmake is an experimental tool for linting and checking
|
||||
Makefiles. It may not do what you want it to.
|
||||
checkmake is a linter for Makefiles. It scans Makefiles for potential issues based on configurable rules.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ lafrenierejm ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ stdenv.mkDerivation {
|
|||
|
||||
for file in "$out"/bin/* "$lib"/lib/*.dylib; do
|
||||
if [ -L "$file" ]; then continue; fi
|
||||
if [[ "$file" == *.py ]]; then continue; fi
|
||||
echo "$file: fixing dylib references"
|
||||
# note that -id does nothing on binaries
|
||||
install_name_tool -id "$file" "''${flags[@]}" "$file"
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.138.0";
|
||||
version = "1.139.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
hash = "sha256-yx6sk6FO7MHNuRFBMhOXTSjtDQ0B6XyhGHb4uHSXx/8=";
|
||||
hash = "sha256-Yj9BqmmotIaTUHIUslaOmRXYC4ujQ9GNjEmaAfLgLgU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchPypi,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
gitMinimal,
|
||||
stdenv,
|
||||
|
|
@ -10,41 +9,32 @@
|
|||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
let
|
||||
# commitizen 4.9.1 is not compatible with version 3.0.52 of prompt-toolkit
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.0.51";
|
||||
pname = "prompt_toolkit";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kxoWLjsn/JDIbxtIux+yxSjCdhR15XycBt4TMRx7VO0=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
python3Packages = python.pkgs;
|
||||
in
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "commitizen";
|
||||
version = "4.10.1";
|
||||
version = "4.11.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commitizen-tools";
|
||||
repo = "commitizen";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-B4V2UPTEXQNASrwGRZbfFOqPuBIFzBM39a5rAC+Hk5Q=";
|
||||
hash = "sha256-7KF7qzBWF8OQLHxXYWHI+zcjBWV7KogMr0FYhitPSTw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "uv_build >= 0.9.17, <0.10.0" "uv-build"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"argcomplete"
|
||||
"decli"
|
||||
"prompt-toolkit"
|
||||
"termcolor"
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [ poetry-core ];
|
||||
build-system = with python3Packages; [ uv-build ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -75,7 +65,7 @@ python3Packages.buildPythonPackage rec {
|
|||
pytest-freezer
|
||||
pytest-mock
|
||||
pytest-regressions
|
||||
pytest7CheckHook
|
||||
pytestCheckHook
|
||||
]);
|
||||
|
||||
versionCheckProgramArg = "version";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "25.1.5";
|
||||
version = "25.2.6";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
in
|
||||
fetchurl {
|
||||
url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz";
|
||||
hash = "sha256-PLYolzwQa9xj6z+r/8jS9tbiR8zVTQKOhtJJBN8dNhI=";
|
||||
hash = "sha256-yiL0FFkSntwLy/oOkiDQKTvTOUrtbv/9kV+1nLZtMB0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "distrobox";
|
||||
version = "1.8.2.2";
|
||||
version = "1.8.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = "distrobox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-g7GbMJeUfDf3FIM2K7rk0X9SNyUMV0A3fSP1J5F44oo=";
|
||||
hash = "sha256-p/IQ6HWG01UPbiskp3u1UUm8YEnpY9jUGqqODrYS1Ck=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "empire-compiler";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bc-security";
|
||||
repo = "empire-compiler";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BuNg5RetGEV/YAZnZP7rkMHif9NczOx2e4OAVDjafuI=";
|
||||
hash = "sha256-HNT1sELoyibXDoRcKkBZiJHIsNY7Hz2fZfHEM93UCBE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ let
|
|||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "etcd-${version}";
|
||||
pname = "etcd";
|
||||
|
||||
inherit meta version;
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ let
|
|||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "etcd-${version}";
|
||||
pname = "etcd";
|
||||
|
||||
inherit meta version;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "euphonica";
|
||||
version = "0.98.0-beta";
|
||||
version = "0.98.1-beta.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "htkhiem";
|
||||
repo = "euphonica";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pLs8aLm2CyT8eVtbB8UQj9xSqnjViRxKjuH3A6RErjA=";
|
||||
hash = "sha256-QFwkHFE+6CcZWwSKIUyf1RVQwHMkVqc4P6NacNgXnH0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-w6xZQP8QTTPKQgPCX20IvoWErrgWVisEIJKkxwtQHho=";
|
||||
hash = "sha256-qbbmi6qRrrzhMl/JJcnaTlV0gzasM5ssZRX3+exGh0o=";
|
||||
};
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ let
|
|||
};
|
||||
|
||||
cygwin = fetchurl {
|
||||
url = "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/cygwin/cygwin-3.6.1-1-x86_64.tar.xz";
|
||||
sha256 = "45d1c76a15426209c20a8d4df813e94fbd17bd5d85ad4d742515ff432400143e";
|
||||
url = "https://mirrors.kernel.org/sourceware/cygwin/x86_64/release/cygwin/cygwin-3.6.6-1-x86_64.tar.xz";
|
||||
hash = "sha256-xcgYjfVB9dF0twGC1ww7r4NCPHT/+aEk1CMmS7ndJuA=";
|
||||
};
|
||||
|
||||
patched_eac = stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -11,20 +11,21 @@
|
|||
nix-update-script,
|
||||
python3Packages,
|
||||
umu-launcher,
|
||||
lsfg-vk,
|
||||
wrapGAppsHook3,
|
||||
xdg-utils,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "faugus-launcher";
|
||||
version = "1.11.8";
|
||||
version = "1.13.9";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faugus";
|
||||
repo = "faugus-launcher";
|
||||
tag = version;
|
||||
hash = "sha256-VgafXX8EuX0WOpG0cxBNlUdLL4HrrcpdblpCMxka2ms=";
|
||||
hash = "sha256-tkCcKnRhIbBXinZsxe7A6UGdzrmcT9l1u4/aopOtA5E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -52,11 +53,16 @@ python3Packages.buildPythonApplication rec {
|
|||
--replace-fail "PathManager.find_binary('faugus-run')" "'$out/bin/.faugus-run-wrapped'" \
|
||||
--replace-fail "PathManager.find_binary('faugus-proton-manager')" "'$out/bin/.faugus-proton-manager-wrapped'" \
|
||||
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \
|
||||
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
|
||||
--replace-fail 'Path("/usr/lib/liblsfg-vk.so")' 'Path("${lsfg-vk}/lib/liblsfg-vk.so")' \
|
||||
--replace-fail 'Exec={faugus_run}' 'Exec=faugus-run'
|
||||
|
||||
substituteInPlace faugus_run.py \
|
||||
--replace-fail "PathManager.find_binary('faugus-components')" "'$out/bin/.faugus-components-wrapped'" \
|
||||
--replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'"
|
||||
|
||||
substituteInPlace faugus/shortcut.py \
|
||||
--replace-fail "/usr/lib/extensions/vulkan/lsfgvk/lib/liblsfg-vk.so" "${lsfg-vk}/lib/liblsfg-vk.so" \
|
||||
--replace-fail 'Path("/usr/lib/liblsfg-vk.so")' 'Path("${lsfg-vk}/lib/liblsfg-vk.so")'
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
ffmpeg-headless,
|
||||
|
|
@ -12,23 +11,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ffmpegthumbnailer";
|
||||
version = "2.2.3";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dirkvdb";
|
||||
repo = "ffmpegthumbnailer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1hVPtCPwfovCtA6aagViUJkYTCFuiFkOqGEqMHIoZe8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-h8B12FItvSrYgy6t78A02DL96Az4BxtW8brFKkZLH9o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "ffmpeg-8-fix.patch";
|
||||
url = "https://github.com/dirkvdb/ffmpegthumbnailer/commit/df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch";
|
||||
hash = "sha256-PArrcKuaWWA6/H59MbdC36B57GSvvp5sHz24QLTBZYw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
|
@ -40,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libjpeg
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
|
||||
cmakeFlags = [
|
||||
"-DENABLE_THUMBNAILER=ON"
|
||||
"-DENABLE_AUDIO_THUMBNAILER=ON"
|
||||
];
|
||||
|
||||
# https://github.com/dirkvdb/ffmpegthumbnailer/issues/215
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,20 +3,21 @@
|
|||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "flood-for-transmission";
|
||||
version = "2025-07-19T10-51-22";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johman10";
|
||||
repo = "flood-for-transmission";
|
||||
tag = version;
|
||||
hash = "sha256-2oHEVvZZcxH9RBKreaiwFKp7Iu5ijYdpXdgVknCxwKw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c1K7ldraw9lzVtABz39B9569jHEuo6N3Iy8aCCfBOXE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-IUdsUGsm6yAbXqf4UGkz1VPa366TnWsTakkbywbLeTU=";
|
||||
npmDepsHash = "sha256-yD9VwnAqE+k2/Z60YdJD6F1f4Cn3fcROCTopDq+DUWU=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
@ -28,12 +29,15 @@ buildNpmPackage rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Flood clone for Transmission";
|
||||
homepage = "https://github.com/johman10/flood-for-transmission";
|
||||
downloadPage = "https://github.com/johman10/flood-for-transmission/releases";
|
||||
changelog = "https://github.com/johman10/flood-for-transmission/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ al3xtjames ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hacompanion";
|
||||
version = "1.0.24";
|
||||
version = "1.0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobias-kuendig";
|
||||
repo = "hacompanion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Lzy25tay8PJvEtZURLec5366nWJElI8D7oDckZmIEoU=";
|
||||
hash = "sha256-CkJ648rYlSzWH0K7vGcxYKiVEsVj+y+p+2bsV7VOi6I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halo";
|
||||
version = "2.22.10";
|
||||
version = "2.22.11";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
|
||||
hash = "sha256-3FrATqUGKSYfwYmDne8mbYGgPyG7+uyZtYVn4Bx+Pl0=";
|
||||
hash = "sha256-22Fp1OMLBU/d6zCZ3zpT4FisTc9OPEC2POfEtLJhHxA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
gccStdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ii";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls=";
|
||||
url = "https://dl.suckless.org/tools/ii-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
|
@ -24,4 +24,4 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "ii";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iio-niri";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zhaith-Izaliel";
|
||||
repo = "iio-niri";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IOMJ1xtjUkUoUgFZ9pxBf5XKdaUHu3WbUH5TlEiNRc4=";
|
||||
hash = "sha256-tbCiG/u350U7UbYDV5gWczDQd//RosNHuzB/cP9Dyyo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-b05Jy+EKFAUcHR9+SdjHZUcIZG0Ta+ar/qc0GdRlJik=";
|
||||
cargoHash = "sha256-JnjBnqZXRhxUClvC2hIW898AwwEOS/ELrsrjY2dV3Is=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "incus-ui-canonical";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabbly";
|
||||
repo = "incus-ui-canonical";
|
||||
# only use tags prefixed by incus- they are the tested fork versions
|
||||
tag = "incus-${version}";
|
||||
hash = "sha256-S/X/knSin3DRfpFGl4uvYtVJrozrBfiN8cfFH/RO10U=";
|
||||
hash = "sha256-Bi0+r9CCXqeyKEjgJT75oWxKmQeziaE62TjcvS5ZkKU=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "kimai";
|
||||
version = "2.44.0";
|
||||
version = "2.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimai";
|
||||
repo = "kimai";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Y2nLM4OK5FsX4e1o0mar5PizwLsqcFdnq4NISp936gE=";
|
||||
hash = "sha256-sZjDl3nQ4i5KVnM2fLVvaQxMlE225q7EBkgFmTn+ugc=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
|
|
@ -38,8 +38,9 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3/LT5HjCpnO3Sz+NshrSMTujtYka0FMyT56qmiEi2t4=";
|
||||
vendorHash = "sha256-FJaWNlzOIm4hJexgKI8fEmRvBfaa8nxxkg8zJeCz3SU=";
|
||||
|
||||
composerNoPlugins = false;
|
||||
postInstall = ''
|
||||
# Make available the console utility, as Kimai doesn't list this in
|
||||
# composer.json.
|
||||
|
|
@ -48,7 +49,7 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
|
||||
# Install bundled assets. This is normally done in the `composer install`
|
||||
# post-install script, but it's being skipped.
|
||||
# (cd "$out"/share/php/kimai && php ./bin/console assets:install)
|
||||
(cd "$out"/share/php/kimai && php ./bin/console assets:install)
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -7,15 +7,19 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kubazip";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuba--";
|
||||
repo = "zip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wNkIYuwwXo7v3vNaOnRZt1tcd0RGjDvCUqDGdvJzVdo=";
|
||||
hash = "sha256-MDRLAfTwjxYTLgg0qsYjyll3TA+jNaUhEPGVOisIsC0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail "-Werror" ""
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
|
|
|
|||
58
pkgs/by-name/la/laravel/composer.lock
generated
58
pkgs/by-name/la/laravel/composer.lock
generated
|
|
@ -167,16 +167,16 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/collections",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/collections.git",
|
||||
"reference": "d3f104a32fdfbf416cd1a839dad0e2c670a03f4e"
|
||||
"reference": "95eb9f848a02a05db35d71b63073ed5f09dc11ce"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/d3f104a32fdfbf416cd1a839dad0e2c670a03f4e",
|
||||
"reference": "d3f104a32fdfbf416cd1a839dad0e2c670a03f4e",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/95eb9f848a02a05db35d71b63073ed5f09dc11ce",
|
||||
"reference": "95eb9f848a02a05db35d71b63073ed5f09dc11ce",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -223,11 +223,11 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-01-07T21:26:29+00:00"
|
||||
"time": "2026-01-19T15:23:52+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/conditionable",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/conditionable.git",
|
||||
|
|
@ -273,7 +273,7 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/contracts",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/contracts.git",
|
||||
|
|
@ -321,16 +321,16 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/filesystem",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/filesystem.git",
|
||||
"reference": "29e1b5f572306c91742514adea3aff93e85f3d3b"
|
||||
"reference": "8cad07cf6004a7cd0a876c6ad2136a1511c2bb58"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/29e1b5f572306c91742514adea3aff93e85f3d3b",
|
||||
"reference": "29e1b5f572306c91742514adea3aff93e85f3d3b",
|
||||
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/8cad07cf6004a7cd0a876c6ad2136a1511c2bb58",
|
||||
"reference": "8cad07cf6004a7cd0a876c6ad2136a1511c2bb58",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -384,11 +384,11 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2025-12-10T20:11:11+00:00"
|
||||
"time": "2026-01-19T15:15:34+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/macroable",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/macroable.git",
|
||||
|
|
@ -434,7 +434,7 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/reflection",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/reflection.git",
|
||||
|
|
@ -485,16 +485,16 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v12.46.0",
|
||||
"version": "v12.48.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "14bfa6aa9a89fa6366c70d266d6d490f0a349c15"
|
||||
"reference": "da511879a72bad39bab776fee4e797a36ca3d681"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/14bfa6aa9a89fa6366c70d266d6d490f0a349c15",
|
||||
"reference": "14bfa6aa9a89fa6366c70d266d6d490f0a349c15",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/da511879a72bad39bab776fee4e797a36ca3d681",
|
||||
"reference": "da511879a72bad39bab776fee4e797a36ca3d681",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -561,20 +561,20 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2026-01-07T14:57:38+00:00"
|
||||
"time": "2026-01-19T15:23:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/prompts",
|
||||
"version": "v0.3.8",
|
||||
"version": "v0.3.10",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/prompts.git",
|
||||
"reference": "096748cdfb81988f60090bbb839ce3205ace0d35"
|
||||
"reference": "360ba095ef9f51017473505191fbd4ab73e1cab3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/prompts/zipball/096748cdfb81988f60090bbb839ce3205ace0d35",
|
||||
"reference": "096748cdfb81988f60090bbb839ce3205ace0d35",
|
||||
"url": "https://api.github.com/repos/laravel/prompts/zipball/360ba095ef9f51017473505191fbd4ab73e1cab3",
|
||||
"reference": "360ba095ef9f51017473505191fbd4ab73e1cab3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -618,9 +618,9 @@
|
|||
"description": "Add beautiful and user-friendly forms to your command-line applications.",
|
||||
"support": {
|
||||
"issues": "https://github.com/laravel/prompts/issues",
|
||||
"source": "https://github.com/laravel/prompts/tree/v0.3.8"
|
||||
"source": "https://github.com/laravel/prompts/tree/v0.3.10"
|
||||
},
|
||||
"time": "2025-11-21T20:52:52+00:00"
|
||||
"time": "2026-01-13T20:29:29+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
|
|
@ -2495,11 +2495,11 @@
|
|||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "2.1.33",
|
||||
"version": "2.1.36",
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9e800e6bee7d5bd02784d4c6069b48032d16224f",
|
||||
"reference": "9e800e6bee7d5bd02784d4c6069b48032d16224f",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/2132e5e2361d11d40af4c17faa16f043269a4cf3",
|
||||
"reference": "2132e5e2361d11d40af4c17faa16f043269a4cf3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -2544,7 +2544,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2025-12-05T10:24:31+00:00"
|
||||
"time": "2026-01-21T13:58:26+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
|
|
|
|||
|
|
@ -7,19 +7,19 @@
|
|||
}:
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "laravel";
|
||||
version = "5.24.0";
|
||||
version = "5.24.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laravel";
|
||||
repo = "installer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E8BJp4HlViXEzLDStiIn9Rz8COqJ9z+tdLtA+xcoV/A=";
|
||||
hash = "sha256-4O6RS6pQzUoMEAVFF27+ebkD5FMzmK9fxpm2TuUiooM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-GV7CiCvkzJvQAv0T7oHPnYu8w4zsLsr6gwAuR1/Zsfo=";
|
||||
vendorHash = "sha256-MqlSBWLQ7edtAJLOkNInh3coMIORAEGr8TuYFr5cqLc=";
|
||||
|
||||
# Adding npm (nodejs) and php composer to path
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@
|
|||
}:
|
||||
let
|
||||
pname = "leiningen";
|
||||
version = "2.11.2";
|
||||
version = "2.12.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg";
|
||||
hash = "sha256-KKGmJmjF9Ce0E6hnfjdq/6qZXwI7H80G4tTJisHfXz4=";
|
||||
hash = "sha256-EqnF46JHFhnKPWSnRi+SD99xOuiVnrT81iV8IzMrWqQ=";
|
||||
};
|
||||
|
||||
jarsrc = fetchurl {
|
||||
url = "https://codeberg.org/leiningen/leiningen/releases/download/${version}/leiningen-${version}-standalone.jar";
|
||||
hash = "sha256-fTGuI652npJ0OLDNVdFak+faurCf1PwVh3l5Fh4Qh3Q=";
|
||||
hash = "sha256-tyGlc69jF4TyfMtS5xnm0Sh9nTlRrVbTFtOPfs+oGqI=";
|
||||
};
|
||||
|
||||
JARNAME = "${pname}-${version}-standalone.jar";
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation {
|
|||
chmod +x $out/bin/lein
|
||||
patchShebangs $out/bin/lein
|
||||
substituteInPlace $out/bin/lein \
|
||||
--replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
|
||||
--replace-fail 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
|
||||
wrapProgram $out/bin/lein \
|
||||
--prefix PATH ":" "${
|
||||
lib.makeBinPath [
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
blueprint-compiler,
|
||||
desktop-file-utils,
|
||||
fetchFromGitHub,
|
||||
glib-networking,
|
||||
gobject-introspection,
|
||||
lib,
|
||||
libadwaita,
|
||||
libsecret,
|
||||
libsoup_3,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
|
|
@ -16,14 +18,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lenspect";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmkspv";
|
||||
repo = "lenspect";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6CC7kTM+Ph/J+aKHCyBIGfKYQIU53t9J5+X4/sCwqJY=";
|
||||
hash = "sha256-zYIDTFjT9izc4WFjs9fYDPDrQ8z16i2Bko5JW0tgCBk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -37,8 +39,10 @@ python3Packages.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
glib-networking
|
||||
libadwaita
|
||||
libsecret
|
||||
libsoup_3
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
|
|
|
|||
58
pkgs/by-name/li/li-ri/package.nix
Normal file
58
pkgs/by-name/li/li-ri/package.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
ninja,
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
simpleini,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "li-ri";
|
||||
version = "3.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "petitlapin";
|
||||
repo = "Li-Ri";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Dw4r0tRUBNQfJzKZI9R51ansRyg9rztBOXjcvjSgJic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
simpleini
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_SYSTEM_SIMPLEINI" true)
|
||||
(lib.cmakeFeature "LIRI_DATA_DIR" "${placeholder "out"}/share/Li-ri/")
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/petitlapin/Li-Ri";
|
||||
description = "Drive a toy wood engine and collect all the coaches to win";
|
||||
maintainers = with lib.maintainers; [
|
||||
jcumming
|
||||
marcin-serwin
|
||||
];
|
||||
platforms = with lib.platforms; linux;
|
||||
license = with lib.licenses; [
|
||||
# Code
|
||||
gpl2Only
|
||||
# or
|
||||
gpl3Only
|
||||
|
||||
# Metadata
|
||||
cc0
|
||||
];
|
||||
mainProgram = "Li-ri";
|
||||
};
|
||||
})
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2026-01-11";
|
||||
version = "0-unstable-2026-01-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "3d62b0e20f5bfa1a244edd70987e565de7e68849";
|
||||
hash = "sha256-nkPMdoqIel0OIFM9J99rX50IUKObnEDERpwIkOYGsA4=";
|
||||
rev = "a38704e29b8241788d91c64e935862a6e86a2a47";
|
||||
hash = "sha256-UBMtUlrbJ+8qh56X1ks19HZCKm1FLmp2bWcNpQJIwdc=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ let
|
|||
binaryName = "librewolf";
|
||||
|
||||
mozillaPlatforms = {
|
||||
i686-linux = "linux-i686";
|
||||
x86_64-linux = "linux-x86_64";
|
||||
aarch64-linux = "linux-arm64";
|
||||
};
|
||||
|
|
@ -37,19 +36,18 @@ let
|
|||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "146.0.1-1";
|
||||
version = "147.0.1-3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
i686-linux = "sha256-Z8dQhYH3PuKI2vXQ2nQ4CmyNyDxtAirX0YVxI0r5n3w=";
|
||||
x86_64-linux = "sha256-pRpSHAkLQpg80pOfUBvGBujr4fDDg4wpltVIw9wrlBE=";
|
||||
aarch64-linux = "sha256-BTqzBAohy+kcWou2WKStoAykcqV1DYfLRNbjUF/TTIY=";
|
||||
x86_64-linux = "sha256-SPGUDTwdEi9ztH9MiFxtiY+xn3258znyu6yw5a9J/YE=";
|
||||
aarch64-linux = "sha256-a6xFoZbBtoFgZFYGmz8IIvBsVP+qKTX32ufmQGdtMBk=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
set -eou pipefail
|
||||
|
||||
latestVersion=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/releases | jq -r '.[0].tag_name')
|
||||
latestVersion=$(curl ${CODEBERG_TOKEN:+-H "Authorization: token $CODEBERG_TOKEN"} -H 'accept: application/json' -sL https://codeberg.org/api/v1/repos/librewolf/bsys6/releases/latest | jq -r '.tag_name')
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; librewolf-bin-unwrapped.version or (lib.getVersion librewolf-bin-unwrapped)" | tr -d '"')
|
||||
|
||||
echo "latest version: $latestVersion"
|
||||
|
|
@ -15,10 +15,9 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then
|
|||
fi
|
||||
|
||||
for i in \
|
||||
"i686-linux linux-i686" \
|
||||
"x86_64-linux linux-x86_64" \
|
||||
"aarch64-linux linux-arm64"; do
|
||||
set -- $i
|
||||
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum))
|
||||
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(curl ${CODEBERG_TOKEN:+-H "Authorization: token $CODEBERG_TOKEN"} -sL https://codeberg.org/api/packages/librewolf/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum))
|
||||
update-source-version librewolf-bin-unwrapped $latestVersion $hash --system=$1 --ignore-same-version
|
||||
done
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "localstack";
|
||||
version = "4.9.2";
|
||||
version = "4.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "localstack";
|
||||
repo = "localstack";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vyk86iuYI6dGUCtijauwT7p4hSWNXluz5cHHRm8zdOE=";
|
||||
hash = "sha256-k5aIdfWm3Tvl/J0s1l0gTXJqnb4j5doJdIIaLLOJXg4=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
|
@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
apispec
|
||||
asn1crypto
|
||||
boto3
|
||||
build
|
||||
cachetools
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lowfi";
|
||||
version = "1.7.2";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "talwat";
|
||||
repo = "lowfi";
|
||||
tag = version;
|
||||
hash = "sha256-0Oim1nGll76APjjfNCuJgjOlEJxAU6vZteECEFhsWkI=";
|
||||
hash = "sha256-RSdfZ0GrNhPcqDWutJW0VlplbpBNBCpSvw91fpl0d4E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vInuM96TJuewhFafDkhOiZiyxwc6SeBsSH8Fs8YIRRs=";
|
||||
cargoHash = "sha256-OAg3ZpBmuINkc6KZJGKvYFnpv9hVbwlnOEP5ICtYh28=";
|
||||
|
||||
buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ];
|
||||
|
||||
|
|
@ -35,6 +35,11 @@ rustPlatform.buildRustPackage rec {
|
|||
alsa-lib
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# Skip this test as it doesn't work in the nix sandbox
|
||||
"--skip=tests::tracks::list::download"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Extremely simple lofi player";
|
||||
homepage = "https://github.com/talwat/lowfi";
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mago";
|
||||
version = "1.0.3";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carthage-software";
|
||||
repo = "mago";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-i8iC16TFT2zqgJeCcJICcbmPr2kAOTZHvZvAXtHwQQw=";
|
||||
hash = "sha256-27+hUA7FNgkpzn9zIH78tuCGT/k3RC2x+Yiuoj/ez6Q=";
|
||||
forceFetchGit = true; # Does not download all files otherwise
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EGtUvFZw16Rxj8gPQLBapJpKUgRjawZQmn1sRD5gU1E=";
|
||||
cargoHash = "sha256-IL5/OG23/53DUNbFWkx5gul99uAzVtPDyvodJds0Tao=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
description = "Toolchain for PHP that aims to provide a set of tools to help developers write better code";
|
||||
homepage = "https://github.com/carthage-software/mago";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
mainProgram = "mago";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mercure";
|
||||
version = "0.20.2";
|
||||
version = "0.21.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "mercure";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DmeBnvJhGYtEGoJDey8+Bb7MuP+Y1GLtQHg6QLoAzv4=";
|
||||
hash = "sha256-hCEoEs6NiShssKER1Z8IVQPF+Ir7wbreGInWmcdnqzE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/caddy";
|
||||
|
||||
vendorHash = "sha256-ZisV7+Mo8TMN+AUGPKHzEluzEShxZCuXrnYgySi57TY=";
|
||||
vendorHash = "sha256-GTHJtNO4JqTEDxVMe0yTgnjhfK2aGZpjMTfSFtL29IU=";
|
||||
|
||||
subPackages = [ "mercure" ];
|
||||
excludedPackages = [ "../cmd/mercure" ];
|
||||
|
|
|
|||
|
|
@ -15,16 +15,17 @@
|
|||
let
|
||||
self = buildGoModule {
|
||||
pname = "micro";
|
||||
version = "2.0.14";
|
||||
version = "2.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyedidia";
|
||||
owner = "micro-editor";
|
||||
repo = "micro";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-avLVl6mn0xKgIy0BNnPZ8ypQhn8Ivj7gTgWbebDSjt0=";
|
||||
hash = "sha256-4C6TtMU6PIYX7lO+o4GRVnIsKnYJxjAqPdoOyAwi7Gc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y=";
|
||||
vendorHash = "sha256-bkPd6zB9e4q6N20wbKS8n8zGGITOoScajdPYv7Race0=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -38,6 +39,8 @@ let
|
|||
ldflags =
|
||||
let
|
||||
t = "github.com/zyedidia/micro/v2/internal";
|
||||
# TODO: switch to this once the source code uses it, passthru.tests.version checks for this
|
||||
# t = "github.com/micro-editor/micro/v2/internal";
|
||||
in
|
||||
[
|
||||
"-s"
|
||||
|
|
@ -68,7 +71,7 @@ let
|
|||
|
||||
meta = {
|
||||
homepage = "https://micro-editor.github.io";
|
||||
changelog = "https://github.com/zyedidia/micro/releases/";
|
||||
changelog = "https://github.com/micro-editor/micro/releases/";
|
||||
description = "Modern and intuitive terminal-based text editor";
|
||||
longDescription = ''
|
||||
micro is a terminal-based text editor that aims to be easy to use and
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@
|
|||
}:
|
||||
buildGoModule {
|
||||
pname = "mozhi";
|
||||
version = "0-unstable-2025-09-19";
|
||||
version = "0-unstable-2026-01-10";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "aryak";
|
||||
repo = "mozhi";
|
||||
rev = "67f216b3fa9edb3b3ec995a4a6fb6777ea934177";
|
||||
hash = "sha256-fQkOyfuBbRLvCzwv7kT1AEJUAWQshWOZDTYfp7plkag=";
|
||||
rev = "6b3f675b8d4c8fb852e88f0696d0c4d72516e618";
|
||||
hash = "sha256-O+heptNxkckcYxUi1QZUBun0F3zquGp5gPVsuWThajQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A=";
|
||||
vendorHash = "sha256-PiduR6mEATCKMi1lvKx4lpuSvNAyMhdeI/pRrsgGNx8=";
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "obsidian";
|
||||
version = "1.10.6";
|
||||
version = "1.11.5";
|
||||
appname = "Obsidian";
|
||||
meta = {
|
||||
description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
|
|
@ -43,9 +43,9 @@ let
|
|||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
hash =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
"sha256-p/vYc1PXgCkzoT49kPVcORFMQZrEjUWaNWvatzwSioo="
|
||||
"sha256-5orx4Fbf7t87dPC4lHO205tnLZ5zhtpxKGOIAva9K/Q="
|
||||
else
|
||||
"sha256-FZbIHYZF/59lBrWz4aaWMlDZNyzrWOsDdVHlO8Gxb3I=";
|
||||
"sha256-j1hMEey5Z0gHkOZTGWdDQL/NKjT7S3qVu3Cpb88Zq68=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ let
|
|||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.81.1";
|
||||
version = "0.81.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-t3S5wsMPrzxuB/6MB/mbysTizvArRoQ1Ap3UVJZLe1w=";
|
||||
hash = "sha256-e0ONaZ2nk+LMxwPO3PQSke0wP2bit+dTPsmRdnOli4o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "postgres-language-server";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/supabase-community/postgres-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OTOyxMikwZ9ImV7sIIas/7KYMK3Sxlr82LW+YPrmoyw=";
|
||||
hash = "sha256-0zmH9hYwmKYTRR1MxaHZcm7B2SzgCxYjLM4GCK61c7s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G8w7+SvKQougWxuIwHTwCwb56VbXh0w9kNv7uq5QVHk=";
|
||||
cargoHash = "sha256-2PEyKjHWEkGEgRy0l6nIhARN0qoR4CIv/Qo+xHucgEc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
|
@ -47,6 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
"--skip=syntax_error"
|
||||
# Requires a database connection
|
||||
"--skip=test_cli_check_command"
|
||||
"--skip=dblint_detects_issues_snapshot"
|
||||
"--skip=dblint_empty_database_snapshot"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
let
|
||||
pname = "postman";
|
||||
version = "11.72.9";
|
||||
version = "11.81.0";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -27,10 +27,10 @@ let
|
|||
name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}";
|
||||
url = "https://dl.pstmn.io/download/version/${version}/${system}";
|
||||
hash = selectSystem {
|
||||
aarch64-darwin = "sha256-/WCdoDyDA3wuCeO/CMxGQ0lhKJNIoDW8sxLGYn/QH2E=";
|
||||
aarch64-linux = "sha256-m3a0xNjGLURhybcpz+pHPfENBwiIg5wEIU3Iu3zkA7s=";
|
||||
x86_64-darwin = "sha256-uUQT5qUQ5iIC874Y56PGpiVuQhQgH4xIdyN6UPTrnDY=";
|
||||
x86_64-linux = "sha256-jwGT1vc5UeQ5WmtgHygVZY0nGZ+NnHy45LsNl4xsBEk=";
|
||||
aarch64-darwin = "sha256-GpX6xhWehKsEe/rSu6am7j5S5TJzyKtkUNokZmlCqA4=";
|
||||
aarch64-linux = "sha256-/M7jzlEI3OD9GmgehBK7TDersB2RjBzsjd3Xs5e46ys=";
|
||||
x86_64-darwin = "sha256-5DCt/W3mWTj0UL65uKmwXnRhIydWRVvBUNVPxwdexYE=";
|
||||
x86_64-linux = "sha256-QgB7eyjl54Grt6ibfffMqO5zOOsUTueoMuDM2Zq9ZsY=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "proton-vpn-cli";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "proton-vpn-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hn7xLb7VWa2dlsrQnjnRgv+8UntOwDak9+rV1HF7k80=";
|
||||
hash = "sha256-nopkUda1XaFMroIvsf+vCXWa5aXUTEC/EhAN9Lto3Lo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,6 +41,7 @@ python3Packages.buildPythonApplication rec {
|
|||
proton-keyring-linux
|
||||
proton-vpn-api-core
|
||||
proton-vpn-local-agent
|
||||
tabulate
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "qmk";
|
||||
version = "1.1.8";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-C0Jra/IK61tngGsuEnMD4mySRc/iZVgdYEbMXtwpBZ0=";
|
||||
hash = "sha256-FkvRbExAGyt2XuTwF7z6gUGULd82KWHEy6GXXYyyikg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "26.1.8";
|
||||
version = "26.1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-pJBVkmXHDm5s3o5TxiJEdRhxQ3AUGw8bD/HTBXXDpIE=";
|
||||
hash = "sha256-07l/ma8FkvnRBgEo8j6dkbdqm3oqyCf3CVKvt+0nzsQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "readest";
|
||||
version = "0.9.97";
|
||||
version = "0.9.98";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "readest";
|
||||
repo = "readest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JrqjOFfO6GGggRhHWq1B/mhcVQgQeFfT51WXlvlFW5Y=";
|
||||
hash = "sha256-qhV2ZEMcnn+0IePaIIvTcCYGCdLAUhtC0GEQAuXWUC8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -42,12 +42,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-Y4GaHo1Jf99F8UhHbNfaAje2tE1QXwbd2upr6eN9qKE=";
|
||||
hash = "sha256-3eYWN5ZZByOO2UFJ7X4PdBr/fNtnBmhrzx4J9IFxiNw=";
|
||||
};
|
||||
|
||||
pnpmRoot = "../..";
|
||||
|
||||
cargoHash = "sha256-AwrA0KXLTSUhLxIJHKU1crVxUxImFOKDRStB48mZfcg=";
|
||||
cargoHash = "sha256-qYBHYjwfGkKmGXN8caamZ6/XGtnxe+lmy6dIpdMwS/I=";
|
||||
|
||||
cargoRoot = "../..";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,391 +0,0 @@
|
|||
diff -r -u Ri-li-2.0.1.orig/src/audio.cc Ri-li-2.0.1/src/audio.cc
|
||||
--- Ri-li-2.0.1.orig/src/audio.cc 2012-01-22 00:40:56.928609371 -0800
|
||||
+++ Ri-li-2.0.1/src/audio.cc 2012-01-22 00:28:33.360636539 -0800
|
||||
@@ -22,8 +22,8 @@
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iostream.h>
|
||||
-#include <string.h>
|
||||
+#include <iostream>
|
||||
+#include <string>
|
||||
|
||||
#include "audio.h"
|
||||
#include "utils.h"
|
||||
@@ -57,7 +57,7 @@
|
||||
char PathFile[512];
|
||||
|
||||
if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
|
||||
- cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<endl;
|
||||
+ std::cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
diff -r -u Ri-li-2.0.1.orig/src/ecran.cc Ri-li-2.0.1/src/ecran.cc
|
||||
--- Ri-li-2.0.1.orig/src/ecran.cc 2007-11-02 04:48:16.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/ecran.cc 2012-01-22 00:13:54.422798653 -0800
|
||||
@@ -21,7 +21,7 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
diff -r -u Ri-li-2.0.1.orig/src/editeur.cc Ri-li-2.0.1/src/editeur.cc
|
||||
--- Ri-li-2.0.1.orig/src/editeur.cc 2007-11-02 04:48:17.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/editeur.cc 2012-01-22 00:28:59.632635579 -0800
|
||||
@@ -25,10 +25,10 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <string>
|
||||
#include <math.h>
|
||||
#include <SDL/SDL.h>
|
||||
|
||||
@@ -374,7 +374,7 @@
|
||||
|
||||
// Sauve le niveau
|
||||
if(Niveau.Save()==false) {
|
||||
- cerr <<"ERREUR Saving levels!"<<endl;
|
||||
+ std::cerr <<"ERREUR Saving levels!"<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
diff -r -u Ri-li-2.0.1.orig/src/jeux.cc Ri-li-2.0.1/src/jeux.cc
|
||||
--- Ri-li-2.0.1.orig/src/jeux.cc 2007-11-02 04:48:17.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/jeux.cc 2012-01-22 00:14:08.422798143 -0800
|
||||
@@ -25,10 +25,10 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <string>
|
||||
#include <math.h>
|
||||
#include <SDL/SDL.h>
|
||||
|
||||
diff -r -u Ri-li-2.0.1.orig/src/loco.cc Ri-li-2.0.1/src/loco.cc
|
||||
--- Ri-li-2.0.1.orig/src/loco.cc 2007-11-02 04:48:18.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/loco.cc 2012-01-22 00:14:17.878797797 -0800
|
||||
@@ -21,10 +21,10 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <string>
|
||||
#include <math.h>
|
||||
#include "preference.h"
|
||||
#include "loco.h"
|
||||
diff -r -u Ri-li-2.0.1.orig/src/main.cc Ri-li-2.0.1/src/main.cc
|
||||
--- Ri-li-2.0.1.orig/src/main.cc 2007-11-02 04:48:19.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/main.cc 2012-01-22 00:29:40.080634136 -0800
|
||||
@@ -23,8 +23,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <iostream.h>
|
||||
-#include <string.h>
|
||||
+#include <iostream>
|
||||
+#include <string>
|
||||
#include <SDL/SDL.h>
|
||||
#include <SDL/SDL_mixer.h>
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
// Initilise SDL
|
||||
if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
|
||||
- cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl;
|
||||
+ std::cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
// Ferme le programme correctement quant quit
|
||||
@@ -125,7 +125,7 @@
|
||||
sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
|
||||
|
||||
if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
|
||||
- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<endl;
|
||||
+ std::cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption);
|
||||
|
||||
if(sdlVideo==NULL) {
|
||||
- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<endl;
|
||||
+ std::cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
// Change le nom de la fenetre
|
||||
diff -r -u Ri-li-2.0.1.orig/src/menu.cc Ri-li-2.0.1/src/menu.cc
|
||||
--- Ri-li-2.0.1.orig/src/menu.cc 2007-11-02 04:48:19.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/menu.cc 2012-01-22 00:30:04.752633198 -0800
|
||||
@@ -21,10 +21,10 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <string>
|
||||
#include "preference.h"
|
||||
#include "menu.h"
|
||||
#include "sprite.h"
|
||||
@@ -92,7 +92,7 @@
|
||||
// Teste la resolution video
|
||||
sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
|
||||
if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
|
||||
- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<endl;
|
||||
+ std::cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
if(Pref.FullScreen) vOption|=SDL_FULLSCREEN;
|
||||
sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption);
|
||||
if(sdlVideo==NULL) {
|
||||
- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<endl;
|
||||
+ std::cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
diff -r -u Ri-li-2.0.1.orig/src/mouse.cc Ri-li-2.0.1/src/mouse.cc
|
||||
--- Ri-li-2.0.1.orig/src/mouse.cc 2007-11-02 04:48:20.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/mouse.cc 2012-01-22 00:14:36.438797120 -0800
|
||||
@@ -21,7 +21,7 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include "mouse.h"
|
||||
#include "preference.h"
|
||||
diff -r -u Ri-li-2.0.1.orig/src/sprite.cc Ri-li-2.0.1/src/sprite.cc
|
||||
--- Ri-li-2.0.1.orig/src/sprite.cc 2007-11-02 04:48:20.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/sprite.cc 2012-01-22 00:30:43.640631779 -0800
|
||||
@@ -21,10 +21,10 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <string>
|
||||
#include <math.h>
|
||||
#include "sprite.h"
|
||||
#include "preference.h"
|
||||
@@ -84,7 +84,7 @@
|
||||
strcpy(PathFile,Langue[Pref.Langue]);
|
||||
GetPath(PathFile);
|
||||
if(FileExiste(PathFile)==false) {
|
||||
- cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<endl;
|
||||
+ std::cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<std::endl;
|
||||
return false;
|
||||
}
|
||||
L=ChargeFichier(PathFile,Buf);
|
||||
@@ -128,7 +128,7 @@
|
||||
// *** Charge le fichier des langues ***
|
||||
// *************************************
|
||||
if(FileExiste(PathFile)==false) {
|
||||
- cerr <<"Impossible de trouver 'language.dat'"<<endl;
|
||||
+ std::cerr <<"Impossible de trouver 'language.dat'"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
L=ChargeFichier(PathFile,Buf);
|
||||
@@ -163,7 +163,7 @@
|
||||
strcpy(PathFile,"sprites.dat");
|
||||
GetPath(PathFile);
|
||||
if(FileExiste(PathFile)==false) {
|
||||
- cerr <<"Impossible de trouver 'sprites.dat'"<<endl;
|
||||
+ std::cerr <<"Impossible de trouver 'sprites.dat'"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
L=ChargeFichier(PathFile,Buf);
|
||||
@@ -352,7 +352,7 @@
|
||||
Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8,
|
||||
0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3));
|
||||
if(Image[i]<=NULL) {
|
||||
- cerr <<"Impossible de créer une Surface SDL!"<<endl;
|
||||
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -486,7 +486,7 @@
|
||||
Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8,
|
||||
0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3));
|
||||
if(Image[0]<=NULL) {
|
||||
- cerr <<"Impossible de créer une Surface SDL!"<<endl;
|
||||
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
diff -r -u Ri-li-2.0.1.orig/src/tableau.cc Ri-li-2.0.1/src/tableau.cc
|
||||
--- Ri-li-2.0.1.orig/src/tableau.cc 2007-11-02 04:48:21.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/tableau.cc 2012-01-22 00:14:50.710796598 -0800
|
||||
@@ -21,7 +21,7 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "preference.h"
|
||||
diff -r -u Ri-li-2.0.1.orig/src/utils.cc Ri-li-2.0.1/src/utils.cc
|
||||
--- Ri-li-2.0.1.orig/src/utils.cc 2007-11-02 04:48:22.000000000 -0700
|
||||
+++ Ri-li-2.0.1/src/utils.cc 2012-01-22 00:31:30.944630051 -0800
|
||||
@@ -21,10 +21,10 @@
|
||||
// with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <string>
|
||||
|
||||
#ifdef WINDOWS
|
||||
#include <windows.h>
|
||||
@@ -77,7 +77,7 @@
|
||||
|
||||
file=fopen(Path,"r");
|
||||
if(!file) {
|
||||
- cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl;
|
||||
+ std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl;
|
||||
perror("fopen");
|
||||
return -1;
|
||||
}
|
||||
@@ -93,7 +93,7 @@
|
||||
|
||||
Buf=new unsigned char [L+1];
|
||||
if(Buf==NULL) {
|
||||
- cerr <<"ERREUR: Memoire insuffisante!"<<endl;
|
||||
+ std::cerr <<"ERREUR: Memoire insuffisante!"<<std::endl;
|
||||
fclose(file);
|
||||
return -1;
|
||||
}
|
||||
@@ -104,7 +104,7 @@
|
||||
while(Compt>1024) {
|
||||
AfficheChargeur();
|
||||
if( fread(Po,1,1024,file) != 1024 ) {
|
||||
- cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<endl;
|
||||
+ std::cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<std::endl;
|
||||
perror("fread");
|
||||
fclose(file);
|
||||
delete [] Buf;
|
||||
@@ -131,13 +131,13 @@
|
||||
|
||||
file=_lopen(Path,OF_READ);
|
||||
if(file==-1) {
|
||||
- cerr <<"Impossible d'ouvrir "<<Path<<endl;
|
||||
+ std::cerr <<"Impossible d'ouvrir "<<Path<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
long L=(long)_llseek(file,0,SEEK_END);
|
||||
if(L==-1) {
|
||||
- cerr <<"Impossible de trouver la longueur du fichier"<<endl;
|
||||
+ std::cerr <<"Impossible de trouver la longueur du fichier"<<std::endl;
|
||||
perror("lseek");
|
||||
_lclose(file);
|
||||
return -1;
|
||||
@@ -146,7 +146,7 @@
|
||||
|
||||
Buf=new unsigned char [L+1];
|
||||
if(Buf==NULL) {
|
||||
- cerr <<"ERREUR: Memoire insuffisante!"<<endl;
|
||||
+ std::cerr <<"ERREUR: Memoire insuffisante!"<<std::endl;
|
||||
_lclose(file);
|
||||
return -1;
|
||||
}
|
||||
@@ -169,14 +169,14 @@
|
||||
|
||||
file=fopen(Path,"w");
|
||||
if(!file) {
|
||||
- cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl;
|
||||
+ std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl;
|
||||
perror("fopen");
|
||||
return false;
|
||||
}
|
||||
|
||||
while(L>512) {
|
||||
if( fwrite(Buf,1,512,file) != 512 ) {
|
||||
- cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl;
|
||||
+ std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl;
|
||||
perror("fwrite");
|
||||
fclose(file);
|
||||
return false;
|
||||
@@ -187,7 +187,7 @@
|
||||
|
||||
if(L>0) {
|
||||
if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) {
|
||||
- cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl;
|
||||
+ std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl;
|
||||
perror("fwrite");
|
||||
fclose(file);
|
||||
return false;
|
||||
@@ -208,7 +208,7 @@
|
||||
|
||||
file=_lcreat(Path,0);
|
||||
if(!file) {
|
||||
- cerr <<"ERREUR: Impossible de créer le fichier '"<<Path<<"'"<<endl;
|
||||
+ std::cerr <<"ERREUR: Impossible de créer le fichier '"<<Path<<"'"<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
_lclose(file);
|
||||
|
||||
if(Lec!=L) {
|
||||
- cerr <<"Problème d'ecriture du fichier '"<<Path<<"' ecris="<<Lec<<" au lieux de ="<<L<<endl;
|
||||
+ std::cerr <<"Problème d'ecriture du fichier '"<<Path<<"' ecris="<<Lec<<" au lieux de ="<<L<<std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
sprintf(Path,"/usr/share/games/Ri-li/%s",Provi);
|
||||
if(FileExiste(Path)) return;
|
||||
|
||||
- cerr <<"Impossible de trouver le fichier '"<<Provi<<endl;
|
||||
+ std::cerr <<"Impossible de trouver le fichier '"<<Provi<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
#endif
|
||||
@@ -266,7 +266,7 @@
|
||||
sprintf(Path,"PROGDIR:%s",Provi);
|
||||
if(FileExiste(Path)) return;
|
||||
|
||||
- cerr <<"Impossible de trouver le fichier '"<<Path<<endl;
|
||||
+ std::cerr <<"Impossible de trouver le fichier '"<<Path<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
#endif
|
||||
@@ -282,7 +282,7 @@
|
||||
sprintf(Path,"Ri-li.app/Contents/Resources/%s",Provi);
|
||||
if(FileExiste(Path)) return;
|
||||
|
||||
- cerr <<"Impossible de trouver le fichier '"<<Path<<endl;
|
||||
+ std::cerr <<"Impossible de trouver le fichier '"<<Path<<std::endl;
|
||||
exit(-1);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
SDL_mixer,
|
||||
SDL,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ri_li";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ri-li/Ri-li-${version}.tar.bz2";
|
||||
sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./moderinze_cpp.patch
|
||||
|
||||
# Build fix for gcc-11 pending upstream inclusion:
|
||||
# https://sourceforge.net/p/ri-li/bugs/2/
|
||||
(fetchpatch {
|
||||
name = "gcc-11.patch";
|
||||
url = "https://sourceforge.net/p/ri-li/bugs/2/attachment/0001-Fix-build-on-gcc-11.patch";
|
||||
sha256 = "01il9lm3amwp3b435ka9q63p0jwlzajwnbshyazx6n9vcnrr17yw";
|
||||
})
|
||||
];
|
||||
|
||||
CPPFLAGS = "-I${lib.getDev SDL}/include -I${lib.getDev SDL}/include/SDL -I${SDL_mixer}/include";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://ri-li.sourceforge.net";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
description = "Children's train game";
|
||||
longDescription = ''
|
||||
Ri-li is an arcade game licensed under the GPL (General Public License).
|
||||
You drive a toy wood engine in many levels and you must collect all the coaches
|
||||
to win.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ jcumming ];
|
||||
platforms = with lib.platforms; linux;
|
||||
mainProgram = "Ri_li";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
cmake,
|
||||
|
|
@ -14,7 +13,7 @@
|
|||
vulkan-loader,
|
||||
libpng,
|
||||
libSM,
|
||||
ffmpeg_7,
|
||||
ffmpeg,
|
||||
libevdev,
|
||||
libusb1,
|
||||
zlib,
|
||||
|
|
@ -29,14 +28,12 @@
|
|||
enableDiscordRpc ? false,
|
||||
faudioSupport ? true,
|
||||
faudio,
|
||||
SDL2,
|
||||
sdl3,
|
||||
waylandSupport ? true,
|
||||
wayland,
|
||||
wrapGAppsHook3,
|
||||
miniupnpc,
|
||||
rtmidi,
|
||||
asmjit,
|
||||
glslang,
|
||||
zstd,
|
||||
hidapi,
|
||||
|
|
@ -53,21 +50,26 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rpcs3";
|
||||
version = "0.0.38";
|
||||
version = "0.0.39-unstable-2026-01-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RPCS3";
|
||||
repo = "rpcs3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HaguOzCN0/FvAb0b4RZWnw9yvVum14wEj26WnqOnSag=";
|
||||
fetchSubmodules = true;
|
||||
rev = "eaebd3426e7050c35beb8f24952d6da4d6a75360";
|
||||
postCheckout = ''
|
||||
cd $out/3rdparty
|
||||
git submodule update --init \
|
||||
fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \
|
||||
feralinteractive/feralinteractive
|
||||
'';
|
||||
hash = "sha256-iE7iZ66BSWI96a9DOeBQEx6NV+CtIyX0PXg3O2RXHWY=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
preConfigure = ''
|
||||
cat > ./rpcs3/git-version.h <<EOF
|
||||
#define RPCS3_GIT_VERSION "nixpkgs"
|
||||
#define RPCS3_GIT_VERSION "nixpkgs-${lib.sources.shortRev finalAttrs.src.rev}"
|
||||
#define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master"
|
||||
#define RPCS3_GIT_BRANCH "HEAD"
|
||||
#define RPCS3_GIT_VERSION_NO_UPDATE 1
|
||||
|
|
@ -120,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
vulkan-headers
|
||||
vulkan-loader
|
||||
libpng
|
||||
ffmpeg_7
|
||||
ffmpeg
|
||||
libevdev
|
||||
zlib
|
||||
libusb1
|
||||
|
|
@ -128,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wolfssl
|
||||
python3
|
||||
pugixml
|
||||
SDL2 # Still needed by FAudio's CMake
|
||||
sdl3
|
||||
flatbuffers
|
||||
llvm_18
|
||||
|
|
@ -137,7 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cubeb
|
||||
miniupnpc
|
||||
rtmidi
|
||||
asmjit
|
||||
glslang
|
||||
zstd
|
||||
hidapi
|
||||
|
|
@ -149,14 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
qtwayland
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-qt-6.10.patch";
|
||||
url = "https://github.com/RPCS3/rpcs3/commit/038ee090b731bf63917371a3586c2f7d7cf4e585.patch";
|
||||
hash = "sha256-jTIxsheG9b9zp0JEeWQ73BunAXmEIg5tj4SrWBfdHy8=";
|
||||
})
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
buildNpmPackage,
|
||||
nodejs,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
pname = "rqbit";
|
||||
|
|
@ -62,13 +63,15 @@ rustPlatform.buildRustPackage {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
passthru.webui = rqbit-webui;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"webui"
|
||||
];
|
||||
passthru = {
|
||||
webui = rqbit-webui;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"webui"
|
||||
];
|
||||
};
|
||||
tests.testService = nixosTests.rqbit;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
}:
|
||||
let
|
||||
pname = "saleae-logic-2";
|
||||
version = "2.4.36";
|
||||
version = "2.4.40";
|
||||
src = fetchurl {
|
||||
url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage";
|
||||
hash = "sha256-M6sjmFHonByjh3rHnAMuSpFKkvOsXqd4XevFDxuEOp4=";
|
||||
hash = "sha256-TG7fH8b0L/O8RjlMB3QJM3/8my49uBX2RwufrVWDgpI=";
|
||||
};
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "saleae-logic-2";
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
ffmpeg,
|
||||
}:
|
||||
let
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "5rahim";
|
||||
repo = "seanime";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AsRbT4P4B8uWyCtoET14pqqXjkZraoPPih6waiuHVso=";
|
||||
hash = "sha256-kK5f/71/LuBVNJLiMfPJsJjxvf6ZorGxtVwC9rX2MEk=";
|
||||
};
|
||||
|
||||
seanime-web = buildNpmPackage {
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shorewall";
|
||||
version = "5.2.3.3";
|
||||
version = "5.2.8";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-${version}.tar.bz2";
|
||||
sha256 = "1gg2yfxzm3y9qqjrrg5nq2ggi1c6yfxx0s7fvwjw70b185mwa5p5";
|
||||
url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-${version}.tar.bz2";
|
||||
hash = "sha256-OZlrlpeiAXlHBJrT8DyyeOj5Of+SSyu0vyoLwXxZmI4=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-${version}.tar.bz2";
|
||||
sha256 = "1ka70pa3s0cnvc83rlm57r05cdv9idnxnq0vmxi6nr7razak5f3b";
|
||||
url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-${version}.tar.bz2";
|
||||
hash = "sha256-+7WrSS7TcuqvAoF8xzD4LEmoHFpfXO5LyPG86EbyMG0=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-${version}.tar.bz2";
|
||||
sha256 = "0mhs4m6agwk082h1n69gnyfsjpycdd8215r4r9rzb3czs5xi087n";
|
||||
url = "https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-${version}.tar.bz2";
|
||||
hash = "sha256-6Cw6lTi2VIGVOY3DnIOwG89m61oigUyRWpJLmtwIjNE=";
|
||||
})
|
||||
];
|
||||
sourceRoot = ".";
|
||||
|
|
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.shorewall.net/";
|
||||
homepage = "https://shorewall.org/";
|
||||
description = "IP gateway/firewall configuration tool for GNU/Linux";
|
||||
longDescription = ''
|
||||
Shorewall is a high-level tool for configuring Netfilter. You describe your
|
||||
|
|
|
|||
|
|
@ -1,45 +1,20 @@
|
|||
{
|
||||
autoPatchelfHook,
|
||||
common-updater-scripts,
|
||||
fetchzip,
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
writeShellScript,
|
||||
}:
|
||||
let
|
||||
platformMap = {
|
||||
"x86_64-linux" = {
|
||||
os = "linux";
|
||||
arch = "x86_64";
|
||||
hash = "sha256-IGks7vmJd/xuJzqhogR5aLVM6eUUe6bACe5VuAWJOWA=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
os = "linux";
|
||||
arch = "aarch64";
|
||||
hash = "sha256-brqotISLIwD1t/2E2oyI7HSkfPpVgUODaNZJcc9o6zI=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
os = "darwin";
|
||||
arch = "x86_64";
|
||||
hash = "sha256-n8GN2ZmeYEpZ0DB7zwEkXnSUZkAySNAGVn5BLw46fZI=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
os = "darwin";
|
||||
arch = "aarch64";
|
||||
hash = "sha256-BISrkxLuxlo7KQiW9cUipJpEhOm94gL3GvyivO6LaBU=";
|
||||
};
|
||||
};
|
||||
platform = platformMap.${stdenvNoCC.hostPlatform.system};
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "silverbullet";
|
||||
version = "2.3.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-${platform.os}-${platform.arch}.zip";
|
||||
hash = platform.hash;
|
||||
stripRoot = false;
|
||||
};
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
|
|
@ -52,8 +27,40 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) silverbullet;
|
||||
passthru = {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-linux-x86_64.zip";
|
||||
hash = "sha256-1jUN22T7BABBEiXp1LwMUaw/ELR7CZS2iKLaoiYKeLk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"aarch64-linux" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-linux-aarch64.zip";
|
||||
hash = "sha256-F0CTVbVK2xaqNlHX1If8EhlDRqb+XIZlWmzkEYFGS3M=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"x86_64-darwin" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-darwin-x86_64.zip";
|
||||
hash = "sha256-lWUTNGt5u7q5cs7xoNP/k7GYUq/A3xHI6rza8HYOK5Y=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"aarch64-darwin" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-darwin-aarch64.zip";
|
||||
hash = "sha256-1lPGipv6jW0Awjy7V9HORK5oh5RDpBBrT4zZk0oSVWY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "update-silverbullet" ''
|
||||
NEW_VERSION="$1"
|
||||
for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
|
||||
${lib.getExe' common-updater-scripts "update-source-version"} "silverbullet" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests) silverbullet;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -63,6 +70,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aorith ];
|
||||
mainProgram = "silverbullet";
|
||||
platforms = builtins.attrNames platformMap;
|
||||
platforms = builtins.attrNames finalAttrs.passthru.sources;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "spacetimedb";
|
||||
version = "1.10.0";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clockworklabs";
|
||||
repo = "spacetimedb";
|
||||
rev = "1d576dc75ca066879f6d9ee4d156c5bce940bd31";
|
||||
hash = "sha256-rqR4A7JpIgdTxjIvq4KNmvU3LMLUZS1AaLSQWVk+tdw=";
|
||||
rev = "02449737ca3b29e7e39679fccbef541a50f32094";
|
||||
hash = "sha256-3e/uxyvxWsEpKV0ynDZ2rqLNIeuBtiG8EEoawswg+0o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FHzFxDnpQL0XSyTAfANsK60y8aOFQMkF4KZFdaspYEI=";
|
||||
cargoHash = "sha256-dV9Advw5Q+zeoMHloYtvRuhx0E3FAfmxjtgoien6ll4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
SDL2_net,
|
||||
spdlog,
|
||||
tinyxml-2,
|
||||
tomlplusplus,
|
||||
zenity,
|
||||
sdl_gamecontrollerdb,
|
||||
spaghettikart,
|
||||
|
|
@ -68,6 +69,12 @@ let
|
|||
hash = "sha256-jRPwO1Vub0cH12YMlME6kd8zGzKmcfIrIJZYpQJeOks=";
|
||||
};
|
||||
|
||||
semver = fetchurl {
|
||||
name = "semver.hpp";
|
||||
url = "https://raw.githubusercontent.com/Neargye/semver/refs/tags/v1.0.0-rc/include/semver.hpp";
|
||||
hash = "sha256-rywMUxJNx/UsWKcgXkWK0++6wvYc5Vrd+cj5QzigQYI=";
|
||||
};
|
||||
|
||||
stb_impl = writeTextFile {
|
||||
name = "stb_impl.c";
|
||||
text = ''
|
||||
|
|
@ -117,13 +124,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "spaghettikart";
|
||||
version = "0.9.9.1-unstable-2025-11-14";
|
||||
version = "0.9.9.1-unstable-2025-12-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HarbourMasters";
|
||||
repo = "SpaghettiKart";
|
||||
rev = "fffd3f7fe92c6eb45b68c0ca522066bf9c54abb2";
|
||||
hash = "sha256-cYFNkVPthqTGT3YiK2MxepAzfVpV8/o2xnZ/zrmmZog=";
|
||||
rev = "b0582b5c32914a815fe6a2ffc41f3eb9c24a3a2b";
|
||||
hash = "sha256-TTsW49jo8yNxuL5GFStiQRWOBw/X8Pt2hMKmDZPpEVI=";
|
||||
fetchSubmodules = true;
|
||||
deepClone = true;
|
||||
postFetch = ''
|
||||
|
|
@ -160,6 +167,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
tinyxml2_src = srcOnly tinyxml-2;
|
||||
})
|
||||
|
||||
# Can't fetch in the sandbox
|
||||
./semver.patch
|
||||
];
|
||||
|
||||
# Recent builds enabled LTO which won't build with nix
|
||||
|
|
@ -185,6 +195,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
SDL2_net
|
||||
spdlog
|
||||
tinyxml-2
|
||||
tomlplusplus
|
||||
zenity
|
||||
];
|
||||
|
||||
|
|
@ -197,6 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TOMLPLUSPLUS" "${tomlplusplus.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-patched}")
|
||||
];
|
||||
|
||||
|
|
@ -211,6 +223,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cp ${stb_impl} ./stb/${stb_impl.name}
|
||||
substituteInPlace libultraship/cmake/dependencies/common.cmake \
|
||||
--replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)"
|
||||
|
||||
mkdir semver
|
||||
cp ${semver} ./semver/semver.hpp
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "\''${SEMVER_DIR}" "$(readlink -f ./semver)"
|
||||
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -232,6 +250,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
installBin Spaghettify
|
||||
mkdir -p $out/share/spaghettikart
|
||||
cp -r ../yamls $out/share/spaghettikart/
|
||||
cp -r ../meta $out/share/spaghettikart/
|
||||
install -Dm644 -t $out/share/spaghettikart {spaghetti.o2r,config.yml,gamecontrollerdb.txt}
|
||||
install -Dm644 ../icon.png $out/share/pixmaps/spaghettikart.png
|
||||
install -Dm644 -t $out/share/licenses/spaghettikart/libgfxd ${libgfxd}/LICENSE
|
||||
|
|
@ -249,6 +268,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--run "ln -sf $out/share/spaghettikart/spaghetti.o2r ~/.local/share/spaghettikart/spaghetti.o2r" \
|
||||
--run "ln -sf $out/share/spaghettikart/config.yml ~/.local/share/spaghettikart/config.yml" \
|
||||
--run "ln -sfT $out/share/spaghettikart/yamls ~/.local/share/spaghettikart/yamls" \
|
||||
--run "ln -sfT $out/share/spaghettikart/meta ~/.local/share/spaghettikart/meta" \
|
||||
--run "ln -sf $out/share/spaghettikart/gamecontrollerdb.txt ~/.local/share/spaghettikart/gamecontrollerdb.txt" \
|
||||
--run 'cd ~/.local/share/spaghettikart'
|
||||
'';
|
||||
|
|
|
|||
13
pkgs/by-name/sp/spaghettikart/semver.patch
Normal file
13
pkgs/by-name/sp/spaghettikart/semver.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c4870b59b..c62c89559 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -353,8 +353,6 @@ file(DOWNLOAD "https://raw.githubusercontent.com/DLTcollab/sse2neon/refs/heads/m
|
||||
include_directories(${SSE2NEON_DIR})
|
||||
|
||||
#================== SEMVER ===================
|
||||
-set(SEMVER_DIR ${CMAKE_BINARY_DIR}/_deps/semver)
|
||||
-file(DOWNLOAD "https://raw.githubusercontent.com/Neargye/semver/refs/tags/v1.0.0-rc/include/semver.hpp" "${SEMVER_DIR}/semver.hpp")
|
||||
|
||||
include_directories(${SEMVER_DIR})
|
||||
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
makeDesktopItem,
|
||||
}:
|
||||
let
|
||||
version = "2.29.0";
|
||||
commit = "f78ece";
|
||||
version = "2.36.1";
|
||||
commit = "ad089d";
|
||||
|
||||
src = fetchzip {
|
||||
name = "StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage";
|
||||
url = "https://github.com/status-im/status-desktop/releases/download/${version}/StatusIm-Desktop-v${version}-${commit}-x86_64.tar.gz";
|
||||
hash = "sha256-i91E1eaN6paM+uZ8EvO1+Wj0Po9KnzQorG0tWKF4hn8=";
|
||||
name = "StatusIm-Desktop-${version}-${commit}-x86_64.AppImage";
|
||||
url = "https://github.com/status-im/status-desktop/releases/download/${version}/StatusIm-Desktop-${version}-${commit}-x86_64.tar.gz";
|
||||
hash = "sha256-urBk1CqVRuBpXc8WAVyyzP1devK8NwbpbBJ+FPX1Awg=";
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
mv $out/StatusIm-Desktop-v${version}-${commit}-x86_64.AppImage $TMPDIR/tmp
|
||||
mv $out/StatusIm-Desktop-${version}-${commit}-x86_64.AppImage $TMPDIR/tmp
|
||||
rm -rf $out
|
||||
mv $TMPDIR/tmp $out
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -26,30 +26,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "torcs";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/torcs/torcs-${version}.tar.bz2";
|
||||
sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa";
|
||||
sha256 = "sha256-S5Z3NUX7NkEZgqbziXIF64/VciedTOVp8s4HsI6Jp68=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/gcc6-isnan.patch";
|
||||
sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch";
|
||||
sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/glibc-default-source.patch";
|
||||
sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/torcs/raw/32bbe77c68b4de07b28c34497f3c0ad666ee618d/debian/patches/gcc7.patch";
|
||||
sha256 = "09iilnvdv8h7b4nb1372arszkbz9hbzsck4rimzz1xjdh9ydniw9";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -89,7 +77,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Car racing game";
|
||||
homepage = "https://torcs.sourceforge.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ pixel-87 ];
|
||||
platforms = lib.platforms.linux;
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.41.0";
|
||||
version = "1.42.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "typos";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-daiM9mhLcYNdz8UPqGfUgKQ0CtULCQvHH/tAbk32w1c=";
|
||||
hash = "sha256-4oUiQ1wohhPOIupPHiox1Id7onJyQ+/7yEECmH+MAPg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BQj3RZWFIO+BucHVHdjEH60iwjunPJwlfdIFHBRmxls=";
|
||||
cargoHash = "sha256-gKkXtyvIXVTEm60aZIxH3suRCbNLgSc+XfYvFC/fbVU=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "veridian";
|
||||
version = "0-unstable-2024-12-25";
|
||||
version = "0-unstable-2025-12-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vivekmalneedi";
|
||||
repo = "veridian";
|
||||
rev = "d094c9d2fa9745b2c4430eef052478c64d5dd3b6";
|
||||
hash = "sha256-3KjUunXTqdesvgDSeQMoXL0LRGsGQXZJGDt+xLWGovM=";
|
||||
rev = "0c5776a4a4e08fd00b90d91ad3cd2ec10315d2bd";
|
||||
hash = "sha256-TQ1qyKQesk0eOArhvfGxOHtIwpyM7iUOgNI1VA1riPE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qJQD9HjSrrHdppbLNgLnXCycgzbmPePydZve3A8zGtU=";
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@
|
|||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayfreeze";
|
||||
version = "0-unstable-2025-07-08";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jappie3";
|
||||
repo = "wayfreeze";
|
||||
rev = "dc41ae1662c4c760f3deba9f826ba605e99971cc";
|
||||
hash = "sha256-dDncKClSsRfkQ27x67U2Mpdcc+nx28bNZughJKar+RU=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jz77zWCUUcXiLdCQpta1b1dlEZaahkhYfhnHUa/Zk2A=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
cargoHash = "sha256-uzTT4WyR7kCL/HPu7JHGQqG9tbO1JGIW1Jtlza5lhPk=";
|
||||
cargoHash = "sha256-cofOfaCDKjVpXJHqXiqz2PSIiscYIzCQI2tm5EdWRvE=";
|
||||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
|
|
@ -36,4 +36,4 @@ rustPlatform.buildRustPackage {
|
|||
mainProgram = "wayfreeze";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -50,6 +50,9 @@
|
|||
vulkan-loader,
|
||||
x264,
|
||||
xrizer,
|
||||
# Only build the OpenXR client library. Useful for building the client library for a different architecture,
|
||||
# e.g. 32-bit library while running 64-bit service on host, so 32-bit apps can connect to the runtime
|
||||
clientLibOnly ? false,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wivrn";
|
||||
|
|
@ -98,6 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
librsvg
|
||||
pkg-config
|
||||
python3
|
||||
]
|
||||
++ lib.optionals (!clientLibOnly) [
|
||||
qt6.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
|
|
@ -105,14 +110,25 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
avahi
|
||||
boost
|
||||
cli11
|
||||
eigen
|
||||
ffmpeg
|
||||
freetype
|
||||
glm
|
||||
harfbuzz
|
||||
libGL
|
||||
libX11
|
||||
libXrandr
|
||||
openxr-loader
|
||||
shaderc
|
||||
systemd
|
||||
udev
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals (!clientLibOnly) [
|
||||
avahi
|
||||
boost
|
||||
cli11
|
||||
ffmpeg
|
||||
kdePackages.kcoreaddons
|
||||
kdePackages.ki18n
|
||||
kdePackages.kiconthemes
|
||||
|
|
@ -121,33 +137,34 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
kdePackages.qqc2-desktop-style
|
||||
libarchive
|
||||
libdrm
|
||||
libGL
|
||||
libnotify
|
||||
libpulseaudio
|
||||
librsvg
|
||||
libva
|
||||
libX11
|
||||
libXrandr
|
||||
nlohmann_json
|
||||
openxr-loader
|
||||
onnxruntime
|
||||
pipewire
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
qt6.qttools
|
||||
shaderc
|
||||
spdlog
|
||||
systemd
|
||||
udev
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
x264
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
++ lib.optionals (cudaSupport && !clientLibOnly) [
|
||||
cudaPackages.cudatoolkit
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "WIVRN_BUILD_CLIENT" false)
|
||||
(lib.cmakeBool "WIVRN_BUILD_DASHBOARD" (!clientLibOnly))
|
||||
(lib.cmakeBool "WIVRN_BUILD_SERVER" (!clientLibOnly))
|
||||
(lib.cmakeBool "WIVRN_BUILD_SERVER_LIBRARY" true)
|
||||
(lib.cmakeBool "WIVRN_BUILD_WIVRNCTL" (!clientLibOnly))
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
|
||||
(lib.cmakeBool "WIVRN_OPENXR_MANIFEST_ABI" clientLibOnly)
|
||||
(lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
|
||||
]
|
||||
++ lib.optionals (!clientLibOnly) [
|
||||
(lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport)
|
||||
(lib.cmakeBool "WIVRN_USE_VAAPI" true)
|
||||
(lib.cmakeBool "WIVRN_USE_VULKAN_ENCODE" true)
|
||||
|
|
@ -155,27 +172,20 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeBool "WIVRN_USE_PIPEWIRE" true)
|
||||
(lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true)
|
||||
(lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true)
|
||||
(lib.cmakeBool "WIVRN_BUILD_CLIENT" false)
|
||||
(lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true)
|
||||
(lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false)
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
|
||||
(lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths)
|
||||
(lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
++ lib.optionals (cudaSupport && !clientLibOnly) [
|
||||
(lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
preFixup = lib.optional (!clientLibOnly) ''
|
||||
wrapQtApp "$out/bin/wivrn-dashboard" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
desktopItems = lib.optionals (!clientLibOnly) [
|
||||
(makeDesktopItem {
|
||||
name = "WiVRn Server";
|
||||
desktopName = "WiVRn Server";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yubico-piv-tool";
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "Yubico";
|
||||
repo = "yubico-piv-tool";
|
||||
tag = "yubico-piv-tool-${finalAttrs.version}";
|
||||
hash = "sha256-1VLSlwwubxCYqdU1ueD2FXEqS5xKtHk4bsJAXOHCDKY=";
|
||||
hash = "sha256-BXYsx9GtH3svHTnJuqCiWIJ+9kE09BjAPbAPKawNCDc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,16 +3,17 @@
|
|||
lib,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "3.4.4";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
hash = "sha256-ApgmHl9WoAmWl03tqv01D0W8orja25f7KZUFLhlZloQ=";
|
||||
hash = "sha256-/6x2HhwW0+A7/CYC+HUCsJ2u1tp4zno6XjpvBLogUKU=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
|
|
@ -37,10 +38,13 @@ appimageTools.wrapType2 rec {
|
|||
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Markdown editor for writing academic texts and taking notes";
|
||||
homepage = "https://www.zettlr.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ maj0e ];
|
||||
license = lib.licenses.gpl3;
|
||||
mainProgram = "zettlr";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -482,39 +482,39 @@ rec {
|
|||
};
|
||||
|
||||
sdk_9_0_3xx = buildNetSdk {
|
||||
version = "9.0.309";
|
||||
version = "9.0.310";
|
||||
srcs = {
|
||||
linux-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-linux-arm.tar.gz";
|
||||
hash = "sha512-p8I1s18mH9XzSzE/Gm5mhNnxDWJqLMLsA++kPA6sz4rdBCCFRZp9lJO3Eqz3B3cQ6Vwn2lWKokRiaxGxLxlHVg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-linux-arm.tar.gz";
|
||||
hash = "sha512-tqTok1za6Ib+H+IQSTvF5u8FjgDdlXNfw2IlSTjcErd/RBrWiNFhlTokD7KrHX18WT9gVev47TrO3PhCjrjC8Q==";
|
||||
};
|
||||
linux-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-linux-arm64.tar.gz";
|
||||
hash = "sha512-gPO6BTOiB+05zPD0PPrE1rliabTKU52r4PN51eMagS4QOlbkY2uEdaGR6oEoXNmCMeEPtIbePByT39Vr9FQufA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-linux-arm64.tar.gz";
|
||||
hash = "sha512-ZVm032pEspC84iiiACsczG3APsAEG33AZQB6hd47Mu0ZgKGkD9BtNtHcePCBEU2oyYcF7KS+gyVcbfhkcICg5w==";
|
||||
};
|
||||
linux-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-linux-x64.tar.gz";
|
||||
hash = "sha512-wAKAFlBy6A+h9vhHYcJFIo0+3IgLuZkvxbS1w6MX7aVr8B/hX3hE/hdrV6FmYNIc0mNaIHk1acIuuuJ/1c0pZg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-linux-x64.tar.gz";
|
||||
hash = "sha512-ggP1ZqI+CRQjgbJzC6Lv7XmpMkDAlrAsmoNB6V1VCibZwxSW2bEc4k7eYbvX+3ITHUz4WIDRAckK6E0kQtCllg==";
|
||||
};
|
||||
linux-musl-arm = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-ixAdj1qJHFVaiU9LMOUm3wnewvlnO3QJLDcHgZU/PEjV+4x4S53A510/zsMQtE09DC/pZasyWCYnw7pmas6hLw==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-linux-musl-arm.tar.gz";
|
||||
hash = "sha512-4f/aegDC/unHy7NsFoYjjNh/ttGno4QAz9VQky/FUt+1ietiJcM9gwbGVzdXjp/C8+SjLOVs9PlDW+jbUIb6aQ==";
|
||||
};
|
||||
linux-musl-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-a/e1pL0BeeVOrgfutnq/vF/Dq7h2uo2nctvpRm84Hsh1mzc98TflCsVNwLoiGH8yCnrQPFH6m3CC2iTmKLVa/w==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-linux-musl-arm64.tar.gz";
|
||||
hash = "sha512-+vwCicaA8n3DpPRt8ykuP88uJ6aS0Fj5n+JtxpSwzFm23hIywVRYPkNTge9oO1Dz9emA5bfF+ssZHyxYg5XdRg==";
|
||||
};
|
||||
linux-musl-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-E1A1z/jTHHKBECPs345ucqMA/VunBE0zcNlM6vdluh8D9lEoLMKILKD7W8PxY+Ej4UTK0eE3E9d4O9NdC8sBAg==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-linux-musl-x64.tar.gz";
|
||||
hash = "sha512-ak1+1wyDOzQnckD/1lXZgLqn+gT4xZPGCH6XJp7RTMYaclIqNJKhLmrWfINLV4CWLDpiY3nXIgRVOD6o/aVc2Q==";
|
||||
};
|
||||
osx-arm64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-osx-arm64.tar.gz";
|
||||
hash = "sha512-yaiiOOO9oA0/5GuDVJ8OE4UD6noK0KrJq/RmaeiS8ylIU0UxWBZ7fS1p6F9MlSW1kaEOqq6tI6S4wSCzK3ufOA==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-osx-arm64.tar.gz";
|
||||
hash = "sha512-XPsMA2axe+WDk5j/re/R3qobE9CDrtp42ZC5plD9n5AvL255nxbDEY6qxMvkrrXXo6ndvBYK/EJu/7XHjdS/EA==";
|
||||
};
|
||||
osx-x64 = {
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.309/dotnet-sdk-9.0.309-osx-x64.tar.gz";
|
||||
hash = "sha512-kN6uJzMWt4XNM6Yw+d4SeKg+SwvsqkzFTnnEsTOXXeCklJNPsgm8SiOgVClwE1TqoPbZP1x7Tf0g1OM3Gt/gBQ==";
|
||||
url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.310/dotnet-sdk-9.0.310-osx-x64.tar.gz";
|
||||
hash = "sha512-0n5VuvI3jrFjkaQNMFind0Ipe4RGU8ltTierVVetHxxsMWjtDDvSExwidbVxjLOWq5DGx99FlN5yPwJ+HI2zlw==";
|
||||
};
|
||||
};
|
||||
inherit commonPackages hostPackages targetPackages;
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fasm-bin";
|
||||
version = "1.73.32";
|
||||
version = "1.73.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://flatassembler.net/fasm-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-WVXL4UNWXa9e7K3MSS0CXK3lczgog9V4XUoYChvvym8=";
|
||||
hash = "sha256-CAlGTsfvpDRWsHh9UysgBorjX+mygEWjFeRaznyDszw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -23,7 +23,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
|
||||
meta = {
|
||||
description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
|
||||
homepage = "https://flatassembler.net/download.php";
|
||||
homepage = "https://flatassembler.net/";
|
||||
downloadPage = "https://flatassembler.net/download.php";
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "fasm";
|
||||
maintainers = [ lib.maintainers.iamanaws ];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildOctavePackage rec {
|
|||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "jgpallero";
|
||||
repo = pname;
|
||||
repo = "octproj";
|
||||
rev = "OctPROJ-${version}";
|
||||
sha256 = "sha256-d/Zf172Etj+GA0cnGsQaKMjOmirE7Hwyj4UECpg7QFM=";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,12 +3,13 @@
|
|||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "assay";
|
||||
version = "0-unstable-2024-05-09";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brandon-rhodes";
|
||||
|
|
@ -17,6 +18,13 @@ buildPythonPackage {
|
|||
hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
postPatch = lib.optionalString (pythonAtLeast "3.14") ''
|
||||
substituteInPlace assay/assertion.py \
|
||||
--replace-fail "op.load_assertion_error" "op.load_common_constant"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "assay" ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -8,30 +8,32 @@
|
|||
buildPythonPackage,
|
||||
setuptools,
|
||||
toml,
|
||||
unittestCheckHook,
|
||||
pytestCheckHook,
|
||||
fetchpatch,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "exiv2";
|
||||
version = "0.17.5";
|
||||
version = "0.18.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jim-easterbrook";
|
||||
repo = "python-exiv2";
|
||||
tag = version;
|
||||
hash = "sha256-MQNovei1Y8EZTF8hEyIWLaL2NbQPCB6FGbVfDHIvNVo=";
|
||||
hash = "sha256-lYz0TWiiBtpwZ56Oiy2v8DFBXoofMv60hxsG0q7Cx9Y=";
|
||||
};
|
||||
|
||||
# FAIL: test_localisation (test_types.TestTypesModule.test_localisation)
|
||||
# FAIL: test_TimeValue (test_value.TestValueModule.test_TimeValue)
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_value.py \
|
||||
--replace-fail "def test_TimeValue(self):" "@unittest.skip('skipping')
|
||||
def test_TimeValue(self):"
|
||||
substituteInPlace tests/test_types.py \
|
||||
--replace-fail "def test_localisation(self):" "@unittest.skip('skipping')
|
||||
def test_localisation(self):"
|
||||
'';
|
||||
patches = [
|
||||
# Disable refcount tests for python >= 3.14
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jim-easterbrook/python-exiv2/commit/fe98ad09ff30f1b6cc5fd5dcc0769f9505c09166.patch";
|
||||
hash = "sha256-+KepYfzocG6qkak+DwXFtCaMiLEAE+FegONgL4vo21o=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jim-easterbrook/python-exiv2/commit/e0a5284620e8d020771bf8c1fa73d6113e662ebf.patch";
|
||||
hash = "sha256-n/yfhP/Z4Is/+2bKsFZtcNXnQe61DjoE9Ryi2q9yTSA=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
|
|
@ -45,12 +47,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
pythonImportsCheck = [ "exiv2" ];
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
unittestFlagsArray = [
|
||||
"-s"
|
||||
"tests"
|
||||
"-v"
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,20 @@
|
|||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-api-python-client";
|
||||
version = "2.185.0";
|
||||
version = "2.188.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "google-api-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uItN7P6tZTxEHfma+S0p4grRRnAaIhuTezvJzWjvkfE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uNvsWCfoT+wp6UnbDP5QS7Os2FnEsTzusdGZ9lD/LwY=";
|
||||
# Remove mixed-case files that cause hash differences between platforms
|
||||
postFetch = ''
|
||||
rm -rf $out/docs/
|
||||
'';
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -43,8 +47,8 @@ buildPythonPackage rec {
|
|||
any new features.
|
||||
'';
|
||||
homepage = "https://github.com/google/google-api-python-client";
|
||||
changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.sarahec ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "paddleocr";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaddlePaddle";
|
||||
repo = "PaddleOCR";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uNgYR9Hop/wNIDG4KQaJxn5m4tBKu5R+pfhO1aSa3iQ=";
|
||||
hash = "sha256-D+ubKviK6Nx+PlvBkTvCfKomZ9og0YrdNZNxMqWlPik=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plotly";
|
||||
version = "6.5.0";
|
||||
version = "6.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JWb5bAu74j63E5tp8wmLjuWZqFAMpkg8utxM74VaGqA=";
|
||||
hash = "sha256-7rMatpaZvHuNPpiXR5eUHultqNnLER1iW+GR3dwgkyo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
certifi,
|
||||
|
|
@ -16,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skyfield";
|
||||
version = "1.53";
|
||||
version = "1.54";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyfielders";
|
||||
repo = "python-skyfield";
|
||||
rev = version;
|
||||
hash = "sha256-CQe+ik6HciOUaRpFp8Cx6cOlOFzeVoMVJrk7+rdcQEo=";
|
||||
hash = "sha256-oZEmc8BVqs3eSaqrjyR/wQu1WTLv4A0a/dpEZduCXqk=";
|
||||
};
|
||||
|
||||
# Fix broken tests on "exotic" platforms.
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue