Merge master into staging-next
This commit is contained in:
+2
-14
@@ -1814,7 +1814,7 @@ rec {
|
||||
=> [ "13" "14" "23" "24" ]
|
||||
```
|
||||
|
||||
The following function call is equivalent to the one deprecated above:
|
||||
If you have an attrset already, consider mapCartesianProduct:
|
||||
|
||||
```nix
|
||||
mapCartesianProduct (x: "${toString x.a}${toString x.b}") { a = [1 2]; b = [3 4]; }
|
||||
@@ -1822,19 +1822,7 @@ rec {
|
||||
```
|
||||
:::
|
||||
*/
|
||||
crossLists = warn ''
|
||||
lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
|
||||
|
||||
For example, the following function call:
|
||||
|
||||
nix-repl> lib.crossLists (x: y: x+y) [[1 2] [3 4]]
|
||||
[ 4 5 5 6 ]
|
||||
|
||||
Can now be replaced by the following one:
|
||||
|
||||
nix-repl> lib.mapCartesianProduct ({x,y}: x+y) { x = [1 2]; y = [3 4]; }
|
||||
[ 4 5 5 6 ]
|
||||
'' (f: foldl (fs: args: concatMap (f: map f args) fs) [ f ]);
|
||||
crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [ f ];
|
||||
|
||||
/**
|
||||
Remove duplicate elements from the `list`. O(n^2) complexity.
|
||||
|
||||
@@ -654,12 +654,6 @@
|
||||
githubId = 96147421;
|
||||
name = "0xperp";
|
||||
};
|
||||
Adjective-Object = {
|
||||
email = "mhuan13@gmail.com";
|
||||
github = "Adjective-Object";
|
||||
githubId = 1174858;
|
||||
name = "Maxwell Huang-Hobbs";
|
||||
};
|
||||
adnelson = {
|
||||
email = "ithinkican@gmail.com";
|
||||
github = "adnelson";
|
||||
@@ -832,12 +826,6 @@
|
||||
githubId = 209175;
|
||||
name = "Alesya Huzik";
|
||||
};
|
||||
aidalgol = {
|
||||
email = "aidalgol+nixpkgs@fastmail.net";
|
||||
github = "aidalgol";
|
||||
githubId = 2313201;
|
||||
name = "Aidan Gauland";
|
||||
};
|
||||
aij = {
|
||||
email = "aij+git@mrph.org";
|
||||
github = "aij";
|
||||
@@ -4194,6 +4182,13 @@
|
||||
githubId = 91694;
|
||||
name = "Javier Candeira";
|
||||
};
|
||||
caniko = {
|
||||
email = "gpg@rotas.mozmail.com";
|
||||
github = "caniko";
|
||||
githubId = 29519599;
|
||||
name = "Can H. Tartanoglu";
|
||||
keys = [ { fingerprint = "DF95 1EC0 9B8F 8094 C616 5589 1D63 6EDE 97DC 0280"; } ];
|
||||
};
|
||||
canndrew = {
|
||||
email = "shum@canndrew.org";
|
||||
github = "canndrew";
|
||||
|
||||
@@ -127,7 +127,7 @@ In addition to numerous new and updated packages, this release has the following
|
||||
|
||||
- [openvscode-server](https://github.com/gitpod-io/openvscode-server), run VS Code on a remote machine with access through a modern web browser from any device, anywhere. Available as [services.openvscode-server](#opt-services.openvscode-server.enable).
|
||||
|
||||
- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](#opt-services.peroxide.enable).
|
||||
- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](options.html#opt-services.peroxide.enable).
|
||||
|
||||
- [photoprism](https://photoprism.app/), a AI-powered photos app for the decentralized web. Available as [services.photoprism](options.html#opt-services.photoprism.enable).
|
||||
|
||||
|
||||
@@ -124,6 +124,8 @@
|
||||
|
||||
- [Prometheus Storagebox Exporter](https://github.com/fleaz/prometheus-storagebox-exporter), a Prometheus exporter for Hetzner storage boxes.
|
||||
|
||||
- [pmount](https://salsa.debian.org/debian/pmount), a tool that allows normal users to mount removable devices without requiring root privileges Available at [programs.pmount](#opt-programs.pmount.enable).
|
||||
|
||||
- [lemurs](https://github.com/coastalwhite/lemurs), a customizable TUI display/login manager. Available at [services.displayManager.lemurs](#opt-services.displayManager.lemurs.enable).
|
||||
|
||||
- [paisa](https://github.com/ananthakumaran/paisa), a personal finance tracker and dashboard. Available as [services.paisa](#opt-services.paisa.enable).
|
||||
|
||||
@@ -288,6 +288,7 @@
|
||||
./programs/partition-manager.nix
|
||||
./programs/pay-respects.nix
|
||||
./programs/plotinus.nix
|
||||
./programs/pmount.nix
|
||||
./programs/pqos-wrapper.nix
|
||||
./programs/projecteur.nix
|
||||
./programs/proxychains.nix
|
||||
@@ -1294,7 +1295,6 @@
|
||||
./services/networking/pangolin.nix
|
||||
./services/networking/pdns-recursor.nix
|
||||
./services/networking/pdnsd.nix
|
||||
./services/networking/peroxide.nix
|
||||
./services/networking/picosnitch.nix
|
||||
./services/networking/pihole-ftl.nix
|
||||
./services/networking/pixiecore.nix
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib.options) mkEnableOption mkPackageOption;
|
||||
inherit (lib.modules) mkIf;
|
||||
inherit (lib.meta) getExe';
|
||||
|
||||
cfg = config.programs.pmount;
|
||||
|
||||
mkSetuidWrapper = package: command: {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = getExe' package command;
|
||||
};
|
||||
in
|
||||
{
|
||||
options.programs.pmount = {
|
||||
enable = mkEnableOption ''
|
||||
pmount, a tool that allows normal users to mount removable devices
|
||||
without requiring root privileges
|
||||
'';
|
||||
|
||||
package = mkPackageOption pkgs "pmount" { };
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
security.wrappers = {
|
||||
pmount = mkSetuidWrapper cfg.package "pmount";
|
||||
pumount = mkSetuidWrapper cfg.package "pumount";
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /media - root root - -"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.peroxide;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
stateDir = "peroxide";
|
||||
in
|
||||
{
|
||||
options.services.peroxide = {
|
||||
enable = mkEnableOption "peroxide";
|
||||
|
||||
package = mkPackageOption pkgs "peroxide" {
|
||||
default = [ "peroxide" ];
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
# https://github.com/sirupsen/logrus#level-logging
|
||||
type = types.enum [
|
||||
"Panic"
|
||||
"Fatal"
|
||||
"Error"
|
||||
"Warning"
|
||||
"Info"
|
||||
"Debug"
|
||||
"Trace"
|
||||
];
|
||||
default = "Warning";
|
||||
example = "Info";
|
||||
description = "Only log messages of this priority or higher.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
||||
options = {
|
||||
UserPortImap = mkOption {
|
||||
type = types.port;
|
||||
default = 1143;
|
||||
description = "The port on which to listen for IMAP connections.";
|
||||
};
|
||||
|
||||
UserPortSmtp = mkOption {
|
||||
type = types.port;
|
||||
default = 1025;
|
||||
description = "The port on which to listen for SMTP connections.";
|
||||
};
|
||||
|
||||
ServerAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "[::0]";
|
||||
example = "localhost";
|
||||
description = "The address on which to listen for connections.";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for peroxide. See
|
||||
[config.example.yaml](https://github.com/ljanyst/peroxide/blob/master/config.example.yaml)
|
||||
for an example configuration.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.peroxide.settings = {
|
||||
# peroxide deletes the cache directory on startup, which requires write
|
||||
# permission on the parent directory, so we can't use
|
||||
# /var/cache/peroxide
|
||||
CacheDir = "/var/cache/peroxide/cache";
|
||||
X509Key = mkDefault "/var/lib/${stateDir}/key.pem";
|
||||
X509Cert = mkDefault "/var/lib/${stateDir}/cert.pem";
|
||||
CookieJar = "/var/lib/${stateDir}/cookies.json";
|
||||
CredentialsStore = "/var/lib/${stateDir}/credentials.json";
|
||||
};
|
||||
|
||||
users.users.peroxide = {
|
||||
isSystemUser = true;
|
||||
group = "peroxide";
|
||||
};
|
||||
users.groups.peroxide = { };
|
||||
|
||||
systemd.services.peroxide = {
|
||||
description = "Peroxide ProtonMail bridge";
|
||||
requires = [ "network.target" ];
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
restartTriggers = [ config.environment.etc."peroxide.conf".source ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "peroxide";
|
||||
LogsDirectory = "peroxide";
|
||||
LogsDirectoryMode = "0750";
|
||||
# Specify just "peroxide" so that the user has write permission, because
|
||||
# peroxide deletes and recreates the cache directory on startup.
|
||||
CacheDirectory = [
|
||||
"peroxide"
|
||||
"peroxide/cache"
|
||||
];
|
||||
CacheDirectoryMode = "0700";
|
||||
StateDirectory = stateDir;
|
||||
StateDirectoryMode = "0700";
|
||||
ExecStart = "${cfg.package}/bin/peroxide -log-file=/var/log/peroxide/peroxide.log -log-level ${cfg.logLevel}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
};
|
||||
|
||||
preStart = ''
|
||||
# Create a self-signed certificate if no certificate exists.
|
||||
if [[ ! -e "${cfg.settings.X509Key}" && ! -e "${cfg.settings.X509Cert}" ]]; then
|
||||
${cfg.package}/bin/peroxide-cfg -action gen-x509 \
|
||||
-x509-org 'N/A' \
|
||||
-x509-cn 'nixos' \
|
||||
-x509-cert "${cfg.settings.X509Cert}" \
|
||||
-x509-key "${cfg.settings.X509Key}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# https://github.com/ljanyst/peroxide/blob/master/peroxide.logrotate
|
||||
services.logrotate.settings.peroxide = {
|
||||
files = "/var/log/peroxide/peroxide.log";
|
||||
rotate = 31;
|
||||
frequency = "daily";
|
||||
compress = true;
|
||||
delaycompress = true;
|
||||
missingok = true;
|
||||
notifempty = true;
|
||||
su = "peroxide peroxide";
|
||||
postrotate = "systemctl reload peroxide";
|
||||
};
|
||||
|
||||
environment.etc."peroxide.conf".source = settingsFormat.generate "peroxide.conf" cfg.settings;
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [
|
||||
aanderse
|
||||
aidalgol
|
||||
];
|
||||
}
|
||||
@@ -21,5 +21,5 @@ in
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ aidalgol ];
|
||||
meta.maintainers = with lib.maintainers; [ jluttine ];
|
||||
}
|
||||
|
||||
@@ -1159,7 +1159,6 @@ in
|
||||
peerflix = runTest ./peerflix.nix;
|
||||
peering-manager = runTest ./web-apps/peering-manager.nix;
|
||||
peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { };
|
||||
peroxide = runTest ./peroxide.nix;
|
||||
pgadmin4 = runTest ./pgadmin4.nix;
|
||||
pgbackrest = import ./pgbackrest { inherit runTest; };
|
||||
pgbouncer = runTest ./pgbouncer.nix;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "pass-secret-service";
|
||||
meta.maintainers = [ lib.maintainers.aidalgol ];
|
||||
meta.maintainers = [ lib.maintainers.jluttine ];
|
||||
|
||||
nodes.machine =
|
||||
{ nodes, pkgs, ... }:
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "peroxide";
|
||||
meta.maintainers = with lib.maintainers; [ aidalgol ];
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
networking.hostName = "nixos";
|
||||
services.peroxide.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("peroxide.service")
|
||||
machine.wait_for_open_port(1143) # IMAP
|
||||
machine.wait_for_open_port(1025) # SMTP
|
||||
'';
|
||||
}
|
||||
@@ -319,6 +319,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
Otree-nvim = buildVimPlugin {
|
||||
pname = "Otree.nvim";
|
||||
version = "2025-09-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Eutrius";
|
||||
repo = "Otree.nvim";
|
||||
rev = "1540ea0a300916f1c43063fda185463b3e8f2f40";
|
||||
sha256 = "0ydvjac2vw1afaz5wibc4ws1p6rng0d4hkb8z0ljdxbjrjqavdb4";
|
||||
};
|
||||
meta.homepage = "https://github.com/Eutrius/Otree.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
PreserveNoEOL = buildVimPlugin {
|
||||
pname = "PreserveNoEOL";
|
||||
version = "2013-06-14";
|
||||
@@ -6180,6 +6193,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
headhunter-nvim = buildVimPlugin {
|
||||
pname = "headhunter.nvim";
|
||||
version = "2025-10-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackInTheWild";
|
||||
repo = "headhunter.nvim";
|
||||
rev = "45eff1653c27a19c47c8a2dfed4897d4a434408d";
|
||||
sha256 = "14p5kcn5drbfsklyvdajfgxyax6d5rpkn8qdnabibsqrw31bkj91";
|
||||
};
|
||||
meta.homepage = "https://github.com/StackInTheWild/headhunter.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
headlines-nvim = buildVimPlugin {
|
||||
pname = "headlines.nvim";
|
||||
version = "2024-09-13";
|
||||
@@ -22377,6 +22403,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
xeno-nvim = buildVimPlugin {
|
||||
pname = "xeno.nvim";
|
||||
version = "2025-08-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyza0d";
|
||||
repo = "xeno.nvim";
|
||||
rev = "4a1d3946b5c3b9b581e76a84746a06b0977b1fed";
|
||||
sha256 = "1lbj321vz1gzgy4wdmzca74hrwzizy2i0645bqix0id4q3zm7lfd";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyza0d/xeno.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
xmake-nvim = buildVimPlugin {
|
||||
pname = "xmake.nvim";
|
||||
version = "2025-04-28";
|
||||
|
||||
@@ -23,6 +23,7 @@ https://github.com/numToStr/Navigator.nvim/,,
|
||||
https://github.com/overcache/NeoSolarized/,,
|
||||
https://github.com/GCBallesteros/NotebookNavigator.nvim/,HEAD,
|
||||
https://github.com/chrisbra/NrrwRgn/,,
|
||||
https://github.com/Eutrius/Otree.nvim/,HEAD,
|
||||
https://github.com/vim-scripts/PreserveNoEOL/,,
|
||||
https://github.com/henriklovhaug/Preview.nvim/,HEAD,
|
||||
https://github.com/yssl/QFEnter/,,
|
||||
@@ -473,6 +474,7 @@ https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
|
||||
https://github.com/neovimhaskell/haskell-vim/,,
|
||||
https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
|
||||
https://github.com/travitch/hasksyn/,,
|
||||
https://github.com/StackInTheWild/headhunter.nvim/,HEAD,
|
||||
https://github.com/lukas-reineke/headlines.nvim/,HEAD,
|
||||
https://github.com/rebelot/heirline.nvim/,,
|
||||
https://github.com/qvalentin/helm-ls.nvim/,HEAD,
|
||||
@@ -1718,6 +1720,7 @@ https://github.com/natecraddock/workspaces.nvim/,HEAD,
|
||||
https://github.com/andrewferrier/wrapping.nvim/,HEAD,
|
||||
https://github.com/tweekmonster/wstrip.vim/,,
|
||||
https://github.com/piersolenski/wtf.nvim/,HEAD,
|
||||
https://github.com/kyza0d/xeno.nvim/,HEAD,
|
||||
https://github.com/Mythos-404/xmake.nvim/,HEAD,
|
||||
https://github.com/drmingdrmer/xptemplate/,,
|
||||
https://github.com/guns/xterm-color-table.vim/,,
|
||||
|
||||
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "mongodb-vscode";
|
||||
publisher = "mongodb";
|
||||
version = "1.14.0";
|
||||
hash = "sha256-cd/dJO2I9heMVNJjGlBO1+c3wGVF+EuycDa+s/aDBxM=";
|
||||
version = "1.14.2";
|
||||
hash = "sha256-dgerxoVeLv9J2oIrfPJcb+ncqIrq5aaf4Rog0EQszvA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-wOlZPf43h/xHgmKRxPWuCdqqorft/cV/V1qlSR7/r3Y=";
|
||||
hash = "sha256-DeyQgxfPD7R2OjQZ99PNN7hV0Vt9jk5sw+XcM+yIURI=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-LcNCD3OHq1IREEZ5y9fkCcdtjXBOd5UuhvG833oAx3Q=";
|
||||
hash = "sha256-A8xjglh1re02mix5BpE00FNyU6Cjj01vz48lmz2acG8=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-I+2SYCPHXTIrZg2imWRpdj4KbuPcdJ3GQdrxu3bInbs=";
|
||||
hash = "sha256-mK/pLDemgmVuLAMYMEeSvi96ckHNq8ie2Y+JENtaTXA=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-PaXHB8lMKpKgaOekBPvzmYPsokaR2pZTzJsIcYujS3A=";
|
||||
hash = "sha256-taFeZB00iBoYQULhlRHDjrj/Zm7aXYgbPiPK7xjnsYU=";
|
||||
};
|
||||
}
|
||||
.${system} or (throw "Unsupported system: ${system}");
|
||||
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
# Please update the corresponding binary (typos-lsp)
|
||||
# when updating this extension.
|
||||
# See pkgs/by-name/ty/typos-lsp/package.nix
|
||||
version = "0.1.44";
|
||||
version = "0.1.45";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "helm-dt";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-labs";
|
||||
repo = "distribution-tooling-for-helm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3zEu4fnvjM1SvyOyj6NzQteyfEh5X7ro/G0gkzt7ghY=";
|
||||
hash = "sha256-2Owm5x42R+BXGPrTz4Kaw8vboy4G6Jx93JWganOUlfo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CIVgNS74V75etC9WBzoxu6aoMHlUYxWd22h2NG1uNn0=";
|
||||
|
||||
@@ -317,13 +317,13 @@
|
||||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-WyIXWOpplukkdCVcI6EyJxcpL1lE+gOwkgLM7ZYjPMM=",
|
||||
"hash": "sha256-J3fkSivj89bLNu+4HHd+9Q4tI731jTTozGNSgxbuwug=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.74.0",
|
||||
"rev": "v3.75.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-29N8ejKj9kuo56hPZkdrQDEF4nwNNzAS1+BSsYOvvl0="
|
||||
"vendorHash": "sha256-DzJGSfqDOteTX+rQJ7NY/GvAaGhNAhOzE91Je40UhnU="
|
||||
},
|
||||
"deno": {
|
||||
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
||||
@@ -516,11 +516,11 @@
|
||||
"vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-efZ/NHcYSv7CSO6gN6DY43px6kJR7KrlOp+HamrvssY=",
|
||||
"hash": "sha256-YefUWAHgBiZebigcCmn5poVkg6ZxHjILzL5JXhrGKFY=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v7.5.0",
|
||||
"rev": "v7.6.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Bii3UrY1WbhewgsURxq7gGVqT1WSszFkif0V88hiyZo="
|
||||
},
|
||||
@@ -786,13 +786,13 @@
|
||||
"vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc="
|
||||
},
|
||||
"migadu": {
|
||||
"hash": "sha256-XXtDXByaSnnUGLPiwUNTPTHqDOED7IJQsf8b9x0/R8E=",
|
||||
"hash": "sha256-Ld7+cL/Ei06Z3Lkx6HyrBP0dPX3S9KYPNwnRG86xsRk=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2025.9.25",
|
||||
"rev": "2025.10.2",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-1kequbTeMoCkLGlnr1TtXDj2agMGMugO2+czrt91ZHE="
|
||||
"vendorHash": "sha256-3/rZWHBQZMvu1nCM/SCdL0TkJ2cxtOCQqGgIblnR9+k="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-+I1nTNxLVny0pgdMF7vXPC3WxkInSXnbeHcqgrWG55s=",
|
||||
@@ -948,13 +948,13 @@
|
||||
"vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE="
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-o4RIRu4SqjA+8mI+XvB1m8ecm2blINkK59UJOYGCyKk=",
|
||||
"hash": "sha256-3+ravOgTUzGXKd/e12opM/xcm0Vqaz4lLbpo3MLetrg=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.36.48",
|
||||
"rev": "v1.36.49",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-TwF/DxoPDtaXyLhE432Su7h/nGncAP8ArsbnvcnABH8="
|
||||
"vendorHash": "sha256-Nvq1/t5TlLSBon8jlPmPUduQtFGKBLQRTZKBmpYHV1M="
|
||||
},
|
||||
"openwrt": {
|
||||
"hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
|
||||
@@ -1408,13 +1408,13 @@
|
||||
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
|
||||
},
|
||||
"venafi": {
|
||||
"hash": "sha256-VrGObs4l2MhawPe7KjUFgxRBiojfulX1cl1Wo7e4Ehg=",
|
||||
"hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
|
||||
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
|
||||
"owner": "Venafi",
|
||||
"repo": "terraform-provider-venafi",
|
||||
"rev": "v0.23.0",
|
||||
"rev": "v0.23.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-iaGvkHPBUrcca4Z3oPrX6qrtkitpnoiBnIpZPg54Z48="
|
||||
"vendorHash": "sha256-chDZVBd7tb1VsfTXcWz7j29LzHpUnJpXKRFAyqxnR8s="
|
||||
},
|
||||
"vinyldns": {
|
||||
"hash": "sha256-ow+o9fRw/t2i4N65zuVFbfPb68ZUcJfNB5ARYqRTsIs=",
|
||||
|
||||
@@ -30,17 +30,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mullvad";
|
||||
version = "2025.9";
|
||||
version = "2025.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mullvad";
|
||||
repo = "mullvadvpn-app";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-BfWPFkNXGDV0ql2hBXh+3hjyn7+pUXL3XzH8w8aIfKw=";
|
||||
hash = "sha256-1Noz+2qKCS4ObJfQu6ftx43rUAIu4wJg4aYyjVFYifo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-kgtjLdTkCnLk27gYEjovPv5k5eHOqQdL8iERKhVDKNQ=";
|
||||
cargoHash = "sha256-+JUp3L8UaMnDYCky/2Yo62uh1bHU7+Vx7vmfRIDgZtk=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p mullvad-daemon --bin mullvad-daemon"
|
||||
|
||||
@@ -30,7 +30,7 @@ mkDerivation rec {
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
version = "15.69.4";
|
||||
version = "15.70.4";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -39,11 +39,11 @@ mkDerivation rec {
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base_url}/teamviewer_${version}_amd64.deb";
|
||||
hash = "sha256-GNGmqgiu4Vk0X+KndCkEoryFHG/Vv/P2xYdlzUJT1wo=";
|
||||
hash = "sha256-VF/afz1PUnoPhc/Bi2P3eTAz6l0aecWEnl0Tcehv4RA=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base_url}/teamviewer_${version}_arm64.deb";
|
||||
hash = "sha256-M6Q6HIp7TgtqzVduMJM1au0i4/hDUUwdIoe3q36YA/0=";
|
||||
hash = "sha256-XronqLbPnXrCUF8v6oVjUO2xv4OM8MyJLffbv8/FEcg=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
sqlite,
|
||||
wxGTK32,
|
||||
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-f1cXrkVCIc1MqTvlCUBFqzHLhIVueybVxipNZRlF2gE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# CMake < 3.5 fix. Remove upon next version bump
|
||||
(fetchpatch {
|
||||
url = "https://github.com/myriadrf/LimeSuite/commit/4e5ad459d50c922267a008e5cecb3efdbff31f09.patch";
|
||||
hash = "sha256-OASki3bISJvV7wjMz0pBT3kO5RvJ5BnymiF6ruHkCJ8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stellarium";
|
||||
version = "25.2";
|
||||
version = "25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2QK9dHflCdmDrRXEHCBpuJR73jsMz9D9lJNa1pbfrTs=";
|
||||
hash = "sha256-9uQ6u1+dSszmKG8eY6kSXhqsCPRGw6tulCTCrLByIxc=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -263,6 +263,12 @@ stdenv.mkDerivation (
|
||||
url = "https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch";
|
||||
hash = "sha256-JzzrMJvAufrxTxtWnzknUS9JLJEed+qdtVnIYYe9LCw=";
|
||||
})
|
||||
# Backport to fix build with cURL 8.16
|
||||
# FIXME: remove in the next update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/xbmc/xbmc/commit/957b4faa0b765bc91e64c6d33f07e853decae0d0.patch";
|
||||
hash = "sha256-zsqcZSjsApcgs/oEdFFlcwldGCVZxCsDG02ogs+q2uw=";
|
||||
})
|
||||
];
|
||||
|
||||
# make derivations declared in the let binding available here, so
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HGhwO0bILHbRyk6YjzI+v6wiIANvTkIRR+SkL4mxv0w=";
|
||||
hash = "sha256-H7U44g4rw15c3Snx88YgAanSw4dWanmTugpGBIwfI6A=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
+29
-7
@@ -1,11 +1,15 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
love,
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
strip-nondeterminism,
|
||||
zip,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -33,23 +37,41 @@ stdenv.mkDerivation rec {
|
||||
inherit pname desktopItems;
|
||||
version = "1.01b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SimonLarsen/90-Second-Portraits/releases/download/${version}/${pname}-${version}.love";
|
||||
sha256 = "0jj3k953r6vb02212gqcgqpb4ima87gnqgls43jmylxq2mcm33h5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimonLarsen";
|
||||
repo = "90-Second-Portraits";
|
||||
tag = version;
|
||||
hash = "sha256-xxgB8Aw7QTK9lPus7Q4E7iP2/rRfCwwiYbk5NqzujHI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# Love 11 support
|
||||
url = "https://github.com/SimonLarsen/90-Second-Portraits/commit/0ae7ba046f14cef9857fd6c05d9072455097441f.patch?full_index=true";
|
||||
hash = "sha256-/C4gqzwHQqZCuTA/m6WX8mvTxmLxOcHRItVLA3bty3Y=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
strip-nondeterminism
|
||||
zip
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
zip -9 -r 90secondportraits.love ./*
|
||||
strip-nondeterminism --type zip 90secondportraits.love
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm444 $src $out/share/games/lovegames/${pname}.love
|
||||
makeWrapper ${love}/bin/love $out/bin/${pname} \
|
||||
--add-flags $out/share/games/lovegames/${pname}.love
|
||||
install -Dm444 90secondportraits.love $out/share/games/lovegames/90secondportraits.love
|
||||
makeWrapper ${love}/bin/love $out/bin/90secondportraits \
|
||||
--add-flags $out/share/games/lovegames/90secondportraits.love
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -16,6 +16,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-luMqXqlJ6UzoawEDmbK38lm3GHosaZm/mFJntBF54Y4=";
|
||||
};
|
||||
|
||||
# Fix the build with CMake 4.
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail \
|
||||
'cmake_minimum_required (VERSION 2.6)' \
|
||||
'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
From 17228e7435f0c3e4244fb8853835538807ca7505 Mon Sep 17 00:00:00 2001
|
||||
From: SkohTV <contact@skoh.dev>
|
||||
Date: Thu, 9 Oct 2025 15:51:07 -0400
|
||||
Subject: [PATCH] Increase `cmake_minimum_required`: 3.3 -> 3.10 cmake 4.0
|
||||
dropped the support for cmake < 3.5
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1c26f9a..ca8e4c2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION "3.3")
|
||||
+cmake_minimum_required(VERSION 3.3...3.10)
|
||||
cmake_policy(SET CMP0063 NEW)
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
@@ -52,6 +52,19 @@ stdenv.mkDerivation {
|
||||
(lib.cmakeBool "ADLplug_Jack" withJack)
|
||||
];
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/445447
|
||||
postPatch = ''
|
||||
substituteInPlace thirdparty/{libADLMIDI,libOPNMIDI}/CMakeLists.txt --replace-fail \
|
||||
'cmake_minimum_required (VERSION 3.2)' \
|
||||
'cmake_minimum_required (VERSION 3.10)'
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# fix for CMake v4
|
||||
# https://github.com/jpcima/ADLplug/pull/100
|
||||
./cmake-v4.patch
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = toString (
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Framework that JUCE needs which don't get linked properly
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libusb1,
|
||||
@@ -18,6 +19,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1v7sfkkxc6f8ny1p9xrax1agkl6q583mjx8k0lrrwdz31rf9qgw9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# CMake < 3.5 fix. Remove upon next version bump.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/airspy/airspyone_host/commit/7290309a663ced66e1e51dc65c1604e563752310.patch";
|
||||
hash = "sha256-DZ7hYFBu9O2e6Fdx3yJdoCHoE1uVhzih0+OpiPTvkaI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/airspy/airspyone_host/commit/3cf6f97976611c2ff6363f7927fe76c465995801.patch";
|
||||
hash = "sha256-7LU3UvpvwQdDF8GPZw/W4Z2CSzUCNk47McNHti3YHP8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/airspy/airspyone_host/commit/f467acd587617640741ecbfade819d10ecd032c2.patch";
|
||||
hash = "sha256-qfJrxM1hq7NScxN++d9IH+fwFfXf/YwZZUDDOVbwIJk=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
|
||||
'';
|
||||
@@ -30,7 +47,10 @@ stdenv.mkDerivation rec {
|
||||
doInstallCheck = true;
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" ];
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"-DINSTALL_UDEV_RULES=ON"
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/airspy/airspyone_host";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
zenity,
|
||||
withGui ? true,
|
||||
}:
|
||||
@@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0;
|
||||
|
||||
buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_1;
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui";
|
||||
@@ -51,6 +52,8 @@ rustPlatform.buildRustPackage rec {
|
||||
maintainers = with lib.maintainers; [ misuzu ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "alfis";
|
||||
broken = withGui && stdenv.hostPlatform.isDarwin;
|
||||
# needs libsoup-2.4, which is soon going to be removed
|
||||
# https://github.com/NixOS/nixpkgs/pull/450065
|
||||
broken = withGui;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "andcli";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
subPackages = [ "cmd/andcli" ];
|
||||
|
||||
@@ -16,10 +16,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tjblackheart";
|
||||
repo = "andcli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-T5XapWiQFZlSKBCqE9sv2pY4okXkeZEKuG6UOK/XyaI=";
|
||||
hash = "sha256-gABpQFD0F08rSVf/6X2i15aulx9ABGPGtq5CaN5ovbw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-652JLCdxDDvhQIz3EbfoI7h+41Er3TiuJXi1cqbA4nI=";
|
||||
vendorHash = "sha256-FpXTKjTThrRejBiB4QKr7GfDsnWmDWDgxn5tHfgU+Dk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.Adjective-Object ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,6 +49,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-dg0msZ0aeyl4L7RqqGur9Lalu1QtE0igEc54WT5F+SQ=";
|
||||
};
|
||||
|
||||
# Fix the build with CMake 4.
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail \
|
||||
'cmake_minimum_required(VERSION 3.9)' \
|
||||
'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -109,7 +117,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://art.pixls.us";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ paperdigits ];
|
||||
mainProgram = "art";
|
||||
mainProgram = "ART";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "arti";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
tag = "arti-v${finalAttrs.version}";
|
||||
hash = "sha256-14wOkbsfNomSCLuozUbKbOGUvhlLkG9iglN6ddkpEPk=";
|
||||
hash = "sha256-uBt4A9ORjJccnmzHxwoVHguvox7jOKqdrc6JdrvSrzk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-I2xH61x6gZXKsHBejMu7C2H4E6oLRj+GUeJEfRz48os=";
|
||||
cargoHash = "sha256-XkdkCCHY+xLc1haFvqpwNsPgs6rh4AAGxMofrIwFFk0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@@ -43,6 +43,9 @@ rustPlatform.buildRustPackage rec {
|
||||
substituteInPlace $file --replace-fail /usr/share $out/share
|
||||
done
|
||||
|
||||
substituteInPlace rog-control-center/src/main.rs \
|
||||
--replace-fail 'std::env::var("RUST_TRANSLATIONS").is_ok()' 'true'
|
||||
|
||||
substituteInPlace data/asusd.rules --replace-fail /usr/bin/systemctl ${lib.getExe' systemd "systemctl"}
|
||||
substituteInPlace data/asusd.service \
|
||||
--replace-fail /usr/bin/asusd $out/bin/asusd \
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "avbroot";
|
||||
version = "3.23.0";
|
||||
version = "3.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chenxiaolong";
|
||||
repo = "avbroot";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-P7t1Tuux04D1tEaMjFPWhaYz4NP3hk5hoJ6kKiHM1S8=";
|
||||
hash = "sha256-ExP1ifZBiAQO0JntUsVPCVtItnX3JTv2QhbOcdbw8zo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ahBzMU8R520EMUgdETr0+gz2fuxKcOV+6fuH4SiRz8U=";
|
||||
cargoHash = "sha256-sLW8sHb9rdE9IGfHTFPnH3JmqqKQK7CMIWohHwgss2c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aws-iam-authenticator";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "aws-iam-authenticator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nnl5QPJWG0hGp15dwcMdhWCPn5Z4noydLA/Nn5koQCU=";
|
||||
hash = "sha256-ahqHn9Pi07rpq8h476rTABkB5nHbnWLIhtQUH89YJ5Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oa0wOI7fbMjuG20g+8u5V2tbX+1R3pcRR7kn1iWMp4Y=";
|
||||
vendorHash = "sha256-mNTyT1uAPZskZIyLxePPjj4bsxYwu+nDreeWCrZyJF8=";
|
||||
|
||||
ldflags =
|
||||
let
|
||||
|
||||
@@ -23,6 +23,13 @@ let
|
||||
"test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1
|
||||
];
|
||||
});
|
||||
prompt-toolkit = prev.prompt-toolkit.overridePythonAttrs (prev: rec {
|
||||
version = "3.0.51";
|
||||
src = prev.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-kxoWLjsn/JDIbxtIux+yxSjCdhR15XycBt4TMRx7VO0=";
|
||||
};
|
||||
});
|
||||
python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: rec {
|
||||
version = "2.8.2";
|
||||
format = "setuptools";
|
||||
@@ -66,14 +73,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.30.6"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.31.11"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
tag = version;
|
||||
hash = "sha256-enCI/yGnxf4/VYID/Di0ZhSiGp0ldgIKYmTnklGpjbc=";
|
||||
hash = "sha256-JyTL3q8MMKSKbNiJvBL3u7vpUNFt9rp2Ueh8mL9FRkM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-watcher";
|
||||
version = "0.26.10";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-watcher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OrOJ24XdYASOgO8170M0huVGYubH8MJ0tbp0hvqmN/w=";
|
||||
hash = "sha256-b99Fx9OY9SKYp56hQd39kmVQI5NvYnxKyIsqIxkQ2tE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JkEJyrBY70+XO9qjw/t2qCayhVQzRkTEp/NXFTr+pXY=";
|
||||
vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY=";
|
||||
|
||||
# The dependency github.com/fsnotify/fsevents requires CGO
|
||||
env.CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "bili-live-tool";
|
||||
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication {
|
||||
owner = "chenxi-Eumenides";
|
||||
repo = "bilibili_live_tool";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gNzR9cDy4sixQOSWAXeX5qOoGkaFOjBU//+iHvG0lG8=";
|
||||
hash = "sha256-0VqNGw3SUCPqJocHh5u6r0isj1Rg+guP2x/LsWqH4Ug=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "blint";
|
||||
version = "2.4.1";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owasp-dep-scan";
|
||||
repo = "blint";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mGeC7+YzQWSlT3sW2la/f21fN8V+YoFd4fwj/PBPCMI=";
|
||||
hash = "sha256-9Hc6tv0oVtgaH3qOVDJvxkXteHkkqzLdA7iHLNRqCdk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -51,6 +51,7 @@ python3Packages.buildPythonApplication rec {
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
# only runs on windows and fails, obviously
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bottom";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = "bottom";
|
||||
tag = version;
|
||||
hash = "sha256-qxs205EQ4cb4oIWWAHw2xuS78ViHCHUVcV3YjCTzoT0=";
|
||||
hash = "sha256-xX7W137OCMbdOsuFSv7lvKn67jDUKuKmtTSRt5Bb3i0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GQYnsnc1Yogt/sIuVWO7qlZ7DLzwLn8LvW09njY8COA=";
|
||||
cargoHash = "sha256-IG+6UUQhFanWjNprjwlPsFHfzxU+TGeNR82xiy+4bWg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoAddDriverRunpath
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.20.7";
|
||||
version = "0.21.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@@ -18,14 +18,14 @@ rustPlatform.buildRustPackage {
|
||||
owner = "tauri-apps";
|
||||
repo = "cargo-mobile2";
|
||||
rev = "cargo-mobile2-v${version}";
|
||||
hash = "sha256-aQLFYnPY6V8+GcK0YGR11RAaqEOxlSpRjzpy7cCSSz8=";
|
||||
hash = "sha256-cWOEjXfbUn0aOl53d9mqQHSRvowVsOOy+mtd0+c935Y=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-2ecNknkFFnqllCPxiIZY5LpVugiEyIY3P6ouNiv/aZc=";
|
||||
cargoHash = "sha256-WS4emnsXotVXQblMcy7165lBvK1423Bi41gXPY5FA9I=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "chirpstack-concentratord";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chirpstack";
|
||||
repo = "chirpstack-concentratord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sqAroYaiDbVbl0Yqdc+Yl1rhYLjUv/Go+//nX4t7S0U=";
|
||||
hash = "sha256-g7GlpibXAS3Nup/mYB2DEP+6UWjYHbSnPHRdpl+3ukA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cg/icdN0ntbVdnEs6I0AJWVYkawsyV1gPYjDMhzzDBY=";
|
||||
cargoHash = "sha256-2ukynvY3ybu5t22PA5sbx3ehlA5aHjbw9v+0y9Bf4TY=";
|
||||
|
||||
buildInputs = [
|
||||
libloragw-2g4
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
pkg-config,
|
||||
openssl,
|
||||
glib-networking,
|
||||
webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
jq,
|
||||
moreutils,
|
||||
}:
|
||||
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
glib-networking
|
||||
openssl
|
||||
webkitgtk_4_0
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
meta = {
|
||||
@@ -92,5 +92,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "cinny";
|
||||
# Waiting for update to Tauri v2, webkitgtk_4_0 is deprecated
|
||||
# See https://github.com/cinnyapp/cinny-desktop/issues/398 and https://github.com/NixOS/nixpkgs/pull/450065
|
||||
broken = true;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.0.10";
|
||||
version = "2.0.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-f90cIyUofV3emYtluLL/KtfAsgjG3gFQGQPGYgDWL2M=";
|
||||
hash = "sha256-h+xNtaA2X9uFlmQgaRUEXB0utIpC9FT2tn+QnnWMVSs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw=";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.7.3-lts";
|
||||
hash = "sha256-wH/UxMgnsK6OIGxEv9CYA67f8PWC0u6IAiW2iY/KThk=";
|
||||
version = "25.8.8.26-lts";
|
||||
hash = "sha256-jzgfbM0WRdbSr0OXB9t0e1BjZQwZaEwIfzg7W4Z11c0=";
|
||||
lts = true;
|
||||
nixUpdateExtraArgs = [
|
||||
"--version-regex"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cobalt";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cobalt-org";
|
||||
repo = "cobalt.rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0MwIJJ7oNUFMNqMzew9HgaZsfBNczBli20vsxtIWZq0=";
|
||||
hash = "sha256-XtytPFg8N4ilFte8s5DoMrQHjAkJ7RkJcMbGXcxmaa4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4oLEInL5hocCkP20lrOzfwPm5ram8Xw6p1qSva1tzNQ=";
|
||||
cargoHash = "sha256-x4cnwCpbDYvUhlp8Fw2//NC9Z/kbv/hGF7MqKAft8bU=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"codebuff": "^1.0.496"
|
||||
"codebuff": "^1.0.500"
|
||||
}
|
||||
},
|
||||
"node_modules/chownr": {
|
||||
@@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/codebuff": {
|
||||
"version": "1.0.496",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.496.tgz",
|
||||
"integrity": "sha512-kFg8+kgZN7wReREMt89mXz5G78c5EZxiMtjjVb6bZD9JUIb8hYRg5AFPQ5RTFW4cMW21l7qO7HZy8Twvln8Nwg==",
|
||||
"version": "1.0.500",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.500.tgz",
|
||||
"integrity": "sha512-qUp7XL749bTAx6p2D7Mbsx5INx9PMEtMqyB3LsH5QLFW2AUGbmQOuxTVMaQFrCUaaJ8RtKaqCSKWwSZ1tq+ylA==",
|
||||
"cpu": [
|
||||
"x64",
|
||||
"arm64"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "codebuff";
|
||||
version = "1.0.496";
|
||||
version = "1.0.500";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
|
||||
hash = "sha256-X/quHRF+DrGtbyDbthXENLXI9vKfjhp9WOn6FBgss4g=";
|
||||
hash = "sha256-5lAQb8rrWhji4961fbkSCr0hgVIgIzrwkQ8y9+HoeDw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ni7tCSyqXSyowVl1XzGkzoovaN3AawYvmW1cWdeHxgw=";
|
||||
npmDepsHash = "sha256-niM6sUtgv+PeYXrDjBpYcM6p+SaNcpmoWAXV+5uCCOY=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "codecrafters-cli";
|
||||
version = "39";
|
||||
version = "40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codecrafters-io";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yvKPDuORHySSYnsjAW3SrZ9GcrFaGfJYoG7+9IfQEVc=";
|
||||
hash = "sha256-JtjzulWeikUR1tJFBjssZuNhiXtQVR9IP2xABz06X/U=";
|
||||
# A shortened git commit hash is part of the version output, and is
|
||||
# needed at build time. Use the `.git` directory to retrieve the
|
||||
# commit SHA, and remove the directory afterwards since it is not needed
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5t/bRx3mT66e/efjWbb527ZdKOn3qV3hroqiLwP180g=";
|
||||
vendorHash = "sha256-LfchGzJPgPVa4wTXoViIEx8B17HMoPPME/2RLkatGUQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
libwpe,
|
||||
libwpe-fdo,
|
||||
glib-networking,
|
||||
webkitgtk_4_0,
|
||||
makeWrapper,
|
||||
wrapGAppsHook3,
|
||||
adwaita-icon-theme,
|
||||
gdk-pixbuf,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cog";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igalia";
|
||||
repo = "cog";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eF7rvOjZntcMmn622342yqfp4ksZ6R/FFBT36bYCViE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
wayland-protocols
|
||||
wayland
|
||||
libwpe
|
||||
libwpe-fdo
|
||||
webkitgtk_4_0
|
||||
glib-networking
|
||||
gdk-pixbuf
|
||||
adwaita-icon-theme
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wayland
|
||||
makeWrapper
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
depsBuildsBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCOG_USE_WEBKITGTK=ON"
|
||||
];
|
||||
|
||||
# https://github.com/Igalia/cog/issues/438
|
||||
postPatch = ''
|
||||
substituteInPlace core/cogcore.pc.in \
|
||||
--replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
|
||||
'';
|
||||
|
||||
# not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/cog \
|
||||
--prefix LD_LIBRARY_PATH : ${libwpe-fdo}/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small single “window” launcher for the WebKit WPE port";
|
||||
homepage = "https://github.com/Igalia/cog";
|
||||
mainProgram = "cog";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matthewbauer ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mainProgram = "comet";
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eliza";
|
||||
version = "0-unstable-2025-05-13";
|
||||
version = "0-unstable-2025-10-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthay";
|
||||
repo = "ELIZA";
|
||||
rev = "00a277838ac0adb2165625129769c78d518a7215";
|
||||
hash = "sha256-CSQyVnjyoSNwQlVXhpqjTGJ8psV9z0m2+ZOWUh6Dhm0=";
|
||||
rev = "448707201101635eb4a56911d2d45f5b36e4a3cd";
|
||||
hash = "sha256-tCNuF+WbukSL9Sp8mCdjJUMRV4hlbCDsrMdpe8Xi84U=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
fpattern,
|
||||
lib,
|
||||
SDL2,
|
||||
stdenv,
|
||||
writeShellScript,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
launcher = writeShellScript "fallout-ce" ''
|
||||
set -eu
|
||||
assetDir="''${XDG_DATA_HOME:-$HOME/.local/share}/fallout-ce"
|
||||
[ -d "$assetDir" ] || mkdir -p "$assetDir"
|
||||
cd "$assetDir"
|
||||
|
||||
notice=0 fault=0
|
||||
requiredFiles=(master.dat critter.dat)
|
||||
for f in "''${requiredFiles[@]}"; do
|
||||
if [ ! -f "$f" ] && [ ! -f "$(tr '[:lower:]' '[:upper:]' <<< "$f")" ]; then
|
||||
echo "Required file $f not found in $PWD"
|
||||
notice=1 fault=1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ! -d "data/sound/music" ] && [ ! -d "DATA/SOUND/MUSIC" ]; then
|
||||
echo "data/sound/music directory not found in $PWD. This may prevent in-game music from functioning."
|
||||
notice=1
|
||||
fi
|
||||
|
||||
if [ $notice -ne 0 ]; then
|
||||
echo "Please reference the installation instructions at https://github.com/alexbatalov/fallout1-ce"
|
||||
fi
|
||||
|
||||
if [ $fault -ne 0 ]; then
|
||||
exit $fault;
|
||||
fi
|
||||
|
||||
exec @out@/libexec/fallout-ce "$@"
|
||||
'';
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fallout-ce";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexbatalov";
|
||||
repo = "fallout1-ce";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix case-sensitive filesystems issue when save/load games
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/alexbatalov/fallout1-ce/commit/fbd25f00e9ccfb5391e394272d536206bb86678b.patch?full_index=1";
|
||||
sha256 = "sha256-MylI1DZwaANuScyRJ7fXch3aym8n6BDRhccAXAyvU70=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace third_party/fpattern/CMakeLists.txt \
|
||||
--replace-fail "FetchContent_Populate" "#FetchContent_Populate" \
|
||||
--replace-fail "\''${fpattern_SOURCE_DIR}" "${fpattern}/include"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D fallout-ce $out/libexec/fallout-ce
|
||||
install -D ${launcher} $out/bin/fallout-ce
|
||||
substituteInPlace $out/bin/fallout-ce --subst-var out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Fallout for modern operating systems";
|
||||
longDescription = ''
|
||||
Fully working re-implementation of Fallout, with the same original gameplay, engine bugfixes, and some quality of life improvements.
|
||||
You must own the game and copy the files to the specified folder to play.
|
||||
'';
|
||||
homepage = "https://github.com/alexbatalov/fallout1-ce";
|
||||
license = lib.licenses.sustainableUse;
|
||||
maintainers = with lib.maintainers; [
|
||||
hughobrien
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fallout-ce";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,108 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
fpattern,
|
||||
lib,
|
||||
SDL2,
|
||||
stdenv,
|
||||
writeShellScript,
|
||||
zlib,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
launcher = writeShellScript "fallout2-ce" ''
|
||||
set -eu
|
||||
assetDir="''${XDG_DATA_HOME:-$HOME/.local/share}/fallout2-ce"
|
||||
[ -d "$assetDir" ] || mkdir -p "$assetDir"
|
||||
cd "$assetDir"
|
||||
|
||||
notice=0 fault=0
|
||||
requiredFiles=(master.dat critter.dat)
|
||||
for f in "''${requiredFiles[@]}"; do
|
||||
if [ ! -f "$f" ]; then
|
||||
echo "Required file $f not found in $PWD, note the files are case-sensitive"
|
||||
notice=1 fault=1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ! -d "data/sound/music" ] && [ ! -d "sound/music" ]; then
|
||||
echo "data/sound/music directory not found in $PWD. This may prevent in-game music from functioning."
|
||||
notice=1
|
||||
fi
|
||||
|
||||
if [ $notice -ne 0 ]; then
|
||||
echo "Please reference the installation instructions at https://github.com/alexbatalov/fallout2-ce"
|
||||
fi
|
||||
|
||||
if [ $fault -ne 0 ]; then
|
||||
exit $fault;
|
||||
fi
|
||||
|
||||
exec @out@/libexec/fallout2-ce "$@"
|
||||
'';
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fallout2-ce";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexbatalov";
|
||||
repo = "fallout2-ce";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r1pnmyuo3uw2R0x9vGScSHIVNA6t+txxABzgHkUEY5U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix case-sensitive filesystems issue when save/load games
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/alexbatalov/fallout2-ce/commit/e770e64a48cd4d0a58a07f8db72839e4747e4c1e.patch?full_index=1";
|
||||
sha256 = "sha256-49N6uXwOBL/sE+f+W4nX6Gpwwpmbgvy38B1NjECiia0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
zlib
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace third_party/fpattern/CMakeLists.txt \
|
||||
--replace-fail "FetchContent_Populate" "#FetchContent_Populate" \
|
||||
--replace-fail "\''${fpattern_SOURCE_DIR}" "${fpattern}/include"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D fallout2-ce $out/libexec/fallout2-ce
|
||||
install -D ${launcher} $out/bin/fallout2-ce
|
||||
substituteInPlace $out/bin/fallout2-ce --subst-var out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Fallout 2 for modern operating systems";
|
||||
longDescription = ''
|
||||
Fully working re-implementation of Fallout 2, with the same original gameplay, engine bugfixes, and some quality of life improvements.
|
||||
You must own the game and copy the files to the specified folder to play.
|
||||
'';
|
||||
homepage = "https://github.com/alexbatalov/fallout2-ce";
|
||||
license = lib.licenses.sustainableUse;
|
||||
maintainers = with lib.maintainers; [
|
||||
hughobrien
|
||||
iedame
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "fallout2-ce";
|
||||
};
|
||||
})
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "fflogs";
|
||||
version = "8.17.68";
|
||||
version = "8.17.71";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
|
||||
hash = "sha256-HnMTTzn6YMTYEXvtwU7R3K9JWG1ipb3RS/Oa46bzqJQ=";
|
||||
hash = "sha256-ey2hfndsLxViy7dYtIwfUgsk9kQycgBpsHGoBwO9LUs=";
|
||||
};
|
||||
extracted = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "newt";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = version;
|
||||
hash = "sha256-CtE4Ug1659Xu90CRMIxXeqfVaw9kOK4WpsW/u3S0ztA=";
|
||||
hash = "sha256-svMAMPK8f5cwIPzr0+WdoWzHDV1jtuO1Lm2oZIVHE6k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VR5YOprMP3wvwb0lnW9KyUWGs/4Zm5GKBe4vnkN32cY=";
|
||||
vendorHash = "sha256-wNdZEfPx12T0jvCEDkz04X8N6t/pNIOXWFSTHteeZYs=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.go \
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "foxglove-cli";
|
||||
version = "1.0.26";
|
||||
version = "1.0.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foxglove";
|
||||
repo = "foxglove-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WDCxkfWzx/tCnzQGP1MZRKfwM3PbwOHyyLUKgVTLmFU=";
|
||||
hash = "sha256-c1Kpy5lT1DCyCq4qcmv+crGgNJ3WSP8TO94NgixY2fQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GjgDRFzW4zqVooHx9WEgWkcnZ+zQsr09OuZxtc9rZD4=";
|
||||
|
||||
@@ -32,21 +32,21 @@
|
||||
sqlite,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freeciv";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeciv";
|
||||
repo = "freeciv";
|
||||
rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
tag = "R${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-IlJ51ryoQ7qzIY9n8dmPQdwH8aPjXvRXXO2COOxWRcc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for f in {common,utility}/*.py; do
|
||||
substituteInPlace $f \
|
||||
--replace '/usr/bin/env python3' ${python3.interpreter}
|
||||
--replace-fail '/usr/bin/env python3' ${python3.interpreter}
|
||||
done
|
||||
for f in bootstrap/*.sh; do
|
||||
patchShebangs $f
|
||||
@@ -127,11 +127,11 @@ stdenv.mkDerivation rec {
|
||||
prehistory and your mission is to lead your tribe from the stone age
|
||||
to the space age...
|
||||
'';
|
||||
homepage = "http://www.freeciv.org"; # http only
|
||||
homepage = "https://freeciv.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ pierron ];
|
||||
platforms = lib.platforms.unix;
|
||||
hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin
|
||||
broken = qtClient && stdenv.hostPlatform.isDarwin; # Missing Qt5 development files
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -11,7 +11,8 @@
|
||||
pkg-config,
|
||||
autoconf-archive,
|
||||
libxml2,
|
||||
icu60,
|
||||
icu,
|
||||
libexttextcat,
|
||||
ticcutils,
|
||||
timbl,
|
||||
mbt,
|
||||
@@ -22,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "frog";
|
||||
version = "0.13.7";
|
||||
version = "0.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LanguageMachines";
|
||||
repo = "frog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-khc2uZ/dOtWPTnt/ZD6ILxD386MaZt6fsvNTWTCbs+c=";
|
||||
hash = "sha256-+oao0aOhXAnXnWbfZXcCzBFER8Q8TaYciAVQHlZ1D+E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,7 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libtool
|
||||
autoconf-archive
|
||||
libxml2
|
||||
icu60
|
||||
icu
|
||||
libexttextcat
|
||||
ticcutils
|
||||
timbl
|
||||
mbt
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "frogdata";
|
||||
version = "0.13";
|
||||
version = "0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LanguageMachines";
|
||||
repo = "frogdata";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f3rPjc8iYPVJsL6pez2WBw+rCxy6xm3DzOi8S+PDkvg=";
|
||||
hash = "sha256-N5AA3y18nPpqrnkDpnTweucz6l1aabQyosX4OwPBUzo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NsPOxnX8BF9J1SqTj6DhPUWSEq7E5+grumPlwHPbA/8=";
|
||||
hash = "sha256-jwImYofmGfpnj43FinFmo9SQP6vpM0C4K6fmUECifG0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-ci-linter";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "orobardet";
|
||||
repo = "gitlab-ci-linter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zH7eeAJzazDf4LnfBxFKMIPIB4Gx4rn7DCEqBV5zIWo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GKv7uWnY9UqDuzj/VcXTAjGJUyUEsZws3ORnPCX8mwU=";
|
||||
|
||||
# Build flags based on the project's Makefile
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
meta = {
|
||||
description = ".gitlab-ci.yml lint helper tool";
|
||||
homepage = "https://gitlab.com/orobardet/gitlab-ci-linter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ caniko ];
|
||||
mainProgram = "gitlab-ci-linter";
|
||||
};
|
||||
})
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-C4zdBsZ+Sz9S5lQ5qivqmrlM6C6jEepq152v3XQvA6E=";
|
||||
hash = "sha256-21VCBUE6wGU7DT98YYPuEz7lw6EMqCfe14mofbai0lk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-runner";
|
||||
version = "18.3.1";
|
||||
version = "18.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D8CNY+lQEK2DgiGfScPxDPday3re/LN4i5jEJTGbshY=";
|
||||
hash = "sha256-kLUQTxj4t6H/by6lzsLmG8S3Ft1QFdUjTa4Y9aCT88o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vP/htZiUp5qL4TMw6AgNW/TVcvx+pl6rxp41SK5g4XM=";
|
||||
vendorHash = "sha256-zXyyfJ3VBBcB3Qfsex2pDcDJIRg/HRgFAytWloHHUnM=";
|
||||
|
||||
# For patchShebangs
|
||||
buildInputs = [ bash ];
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "18.4.1",
|
||||
"repo_hash": "0wqk6vcjsnv84qbngzri4klg299kk154cadl98zf9vzypv5l66rz",
|
||||
"version": "18.4.2",
|
||||
"repo_hash": "053fw6g1rrqlmgr22phbsv57pg04iy20yv3yvgz1hm4jn2jm0zln",
|
||||
"yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.4.1-ee",
|
||||
"rev": "v18.4.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.4.1",
|
||||
"GITLAB_PAGES_VERSION": "18.4.1",
|
||||
"GITALY_SERVER_VERSION": "18.4.2",
|
||||
"GITLAB_PAGES_VERSION": "18.4.2",
|
||||
"GITLAB_SHELL_VERSION": "14.45.2",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.4.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "18.4.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -211,7 +211,7 @@ gem 'fog-local', '~> 0.8', feature_category: :shared
|
||||
# We may want to update this dependency if this is ever addressed upstream, e.g. via
|
||||
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
|
||||
gem 'fog-aliyun', '~> 0.4', feature_category: :shared
|
||||
gem 'gitlab-fog-azure-rm', '~> 2.3.0', require: 'fog/azurerm', feature_category: :shared
|
||||
gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared
|
||||
|
||||
# for Google storage
|
||||
|
||||
|
||||
@@ -739,7 +739,7 @@ GEM
|
||||
gitlab-experiment (0.9.1)
|
||||
activesupport (>= 3.0)
|
||||
request_store (>= 1.0)
|
||||
gitlab-fog-azure-rm (2.3.0)
|
||||
gitlab-fog-azure-rm (2.4.0)
|
||||
faraday (~> 2.0)
|
||||
faraday-follow_redirects (~> 0.3.0)
|
||||
faraday-net_http_persistent (~> 2.0)
|
||||
@@ -2170,7 +2170,7 @@ DEPENDENCIES
|
||||
gitlab-dangerfiles (~> 4.10.0)
|
||||
gitlab-duo-workflow-service-client (~> 0.3)!
|
||||
gitlab-experiment (~> 0.9.1)
|
||||
gitlab-fog-azure-rm (~> 2.3.0)
|
||||
gitlab-fog-azure-rm (~> 2.4.0)
|
||||
gitlab-glfm-markdown (~> 0.0.33)
|
||||
gitlab-housekeeper!
|
||||
gitlab-http!
|
||||
|
||||
@@ -2939,10 +2939,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03xwn2477zhc4654c7s1ks72w9lbns79n2qhfca7m17349vivpw8";
|
||||
sha256 = "02rnrd403hp5hwgvrapl3mvqp6gzr422v81wwq8dlzm38bjqd2v7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
gitlab-glfm-markdown = {
|
||||
dependencies = [ "rb_sys" ];
|
||||
|
||||
@@ -22,7 +22,7 @@ click_log.basic_config(logger)
|
||||
|
||||
|
||||
class GitLabRepo:
|
||||
version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?")
|
||||
version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?(\-gitlab)?$")
|
||||
|
||||
def __init__(self, owner: str = "gitlab-org", repo: str = "gitlab"):
|
||||
self.owner = owner
|
||||
|
||||
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
|
||||
mainProgram = "gogdl";
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
};
|
||||
|
||||
# Upstream no longer create git tags when bumping the version, so we have to
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotify-server";
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0kMjHq+GuxTqdiaQq1Px+aWgwDbJVva4MZFIfAGvaKk=";
|
||||
hash = "sha256-SPWJH5WELBNJpnGZdyMCJGi6m2WbV7BFOQAtT9ItZJ0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cXt8SZNDhYxfQq/B0zhZLmQs8vAFHXh3qTz/1dtB3mU=";
|
||||
vendorHash = "sha256-bSU7Y+Hupdd8l7LTyVc3YMlZJRojNRqiogE17m/xpr8=";
|
||||
|
||||
# No test
|
||||
doCheck = false;
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Etaash-mathamsetty/heroic-epic-integration";
|
||||
changelog = "https://github.com/Etaash-mathamsetty/heroic-epic-integration/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aidalgol ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication {
|
||||
'';
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/legendary";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
mainProgram = "legendary";
|
||||
};
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
||||
changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
maintainers = with maintainers; [ iedame ];
|
||||
# Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
|
||||
# It may also work on other Linux targets, but all the game stores only
|
||||
# support x86 Linux, so it would require extra hacking to run games via QEMU
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
zita-convolver,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ir.lv2";
|
||||
version = "0-unstable-2018-06-21";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.hq.sig7.se/ir.lv2.git";
|
||||
rev = "38bf3ec7d370d8234dd55be99c14cf9533b43c60";
|
||||
sha256 = "sha256-5toZYQX2oIAfQ5XPMMN+HGNE4FOE/t6mciih/OpU1dw=";
|
||||
rev = "1d4a4f9b1aad6223d541ebb0c16d85d527478222";
|
||||
hash = "sha256-6/KpwM/aHMNvtpf3/BJQjGe1kRZx3NFmV8F6r/bPkII=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -37,20 +37,18 @@ stdenv.mkDerivation {
|
||||
postBuild = "make convert4chan";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mkdir "$out/include"
|
||||
mkdir -p "$out/share/doc"
|
||||
|
||||
runHook preInstall
|
||||
make PREFIX="$out" INSTDIR="$out/lib/lv2" install
|
||||
install -Dm755 convert4chan "$out/bin/convert4chan"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://factorial.hu/plugins/lv2/ir";
|
||||
description = "Zero-latency, realtime, high performance signal convolver especially for creating reverb effects";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
description = "Low-latency, realtime, high performance signal convolver especially for creating reverb effects.";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.magnetophon ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "convert4chan";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iroh";
|
||||
version = "0.92.0";
|
||||
version = "0.93.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = "iroh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Xdiw77zJd0WfrEqo4Y6BwyD9qAKFEIUS511CQvtU9xs=";
|
||||
hash = "sha256-GTvplzx+F5vGWaqgp4YhjcuKUvLysMoHQceVQ6l2an4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Bq53DOZZ+MJlzJVHL6uPAH/YXkeSFFHhTlC2ZkvW7FM=";
|
||||
cargoHash = "sha256-Ss/JJZUGYXuNH9jtqJTi9/OrAd4Ot4z0bp9qkPg+ZrA=";
|
||||
|
||||
# Some tests require network access which is not available in nix build sandbox.
|
||||
doCheck = false;
|
||||
|
||||
@@ -42,7 +42,6 @@ buildGoModule rec {
|
||||
mainProgram = "jf";
|
||||
maintainers = with lib.maintainers; [
|
||||
detegr
|
||||
aidalgol
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
jekyll,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
@@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-QHp0DOu/pqcgN7di219cHzfFb7fWtdGGE6J1ZXgbOGQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# ref. https://github.com/google/jsonnet/pull/1249 merged upstream
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/jsonnet/commit/6c87c1b0e1e18d25898be071c1b231e264f05a8c.patch";
|
||||
hash = "sha256-KprhMKwUCpvLiMT/grfqZ8Vt9rbosIizQgNMStuV8/U=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jekyll
|
||||
cmake
|
||||
|
||||
@@ -9,18 +9,18 @@ buildGoModule (finalAttrs: {
|
||||
# "chatgpt-cli" is taken by another package with the same upsteam name.
|
||||
# To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier.
|
||||
pname = "kardolus-chatgpt-cli";
|
||||
version = "1.8.10";
|
||||
version = "1.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kardolus";
|
||||
repo = "chatgpt-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XZ9f+PAY0i7DfzZCxtZFw1jit7o/tjqAEc8uJpqiOAc=";
|
||||
hash = "sha256-PcZB/XDvCPkbfJmp0c43QCCv0Z5Ih6ZyHYrCdMciDTU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
# The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment,
|
||||
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.10/test/contract/contract_test.go#L35)
|
||||
# (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.8.11/test/contract/contract_test.go#L35)
|
||||
# which will not be the case in the pipeline.
|
||||
# Therefore, tests must be skipped.
|
||||
doCheck = false;
|
||||
|
||||
@@ -102,7 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
aidalgol
|
||||
das-g
|
||||
];
|
||||
};
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubetui";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarub0b0";
|
||||
repo = "kubetui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3n4XxbdCA9TrtFdOQWsp3f/JIUlepzMRpo9J4eNcsvA=";
|
||||
hash = "sha256-2bcFame21oj8kYJaGiBHcZspplLIDuag64AbLGwOvQs=";
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
"--skip=workers::kube::store::tests::kubeconfigからstateを生成"
|
||||
];
|
||||
|
||||
cargoHash = "sha256-RdwDojQodlT7iq75WvFXgh1avpLogybZhYnVRfcC7SI=";
|
||||
cargoHash = "sha256-PzGlTTx5cVnMoUx0VQi+s8VHNV/PJDu6bm1TZuHbaoE=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/sarub0b0/kubetui";
|
||||
|
||||
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeDir = "../src";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
|
||||
];
|
||||
|
||||
# Running the tests is required to build the *.olean files for the core
|
||||
# library.
|
||||
doCheck = true;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libdwarf";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davea42";
|
||||
repo = "libdwarf-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q+ke5vRSBFZirCIBu8M88LzBQW851kjkW4vUgE89ejQ=";
|
||||
hash = "sha256-PJhhrNsYZNDKzLYJzF+eSJfEH1ehF/aeJrNjiEdFEas=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pkg-config,
|
||||
autoconf-archive,
|
||||
libxml2,
|
||||
icu60,
|
||||
icu,
|
||||
bzip2,
|
||||
libtar,
|
||||
ticcutils,
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libfolia";
|
||||
version = "1.7";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LanguageMachines";
|
||||
repo = "libfolia";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fH+XqTaMf7/8ZA0lwWiD7s7fmGkjni83Q7lv5sh50H4=";
|
||||
hash = "sha256-p1caLiYcmokrjiDXLEkPpTOIPIR8Ofv/JsRkHs4PsPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
autoconf-archive
|
||||
libtar
|
||||
libxml2
|
||||
icu60
|
||||
icu
|
||||
ticcutils
|
||||
];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodule";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedeDP";
|
||||
repo = "libmodule";
|
||||
rev = version;
|
||||
sha256 = "sha256-wkRiDWO9wUyxkAeqvm99u22Jq4xnQJx6zS7Sb+R8iMg=";
|
||||
sha256 = "sha256-93ItLKThtT9JRc+X/bRm06pugsN31HAF3qTUqqCu6nE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
From 12661e59111d3cf1e5b27d59b54810edc1997d27 Mon Sep 17 00:00:00 2001
|
||||
From: Skoh <101289702+SkohTV@users.noreply.github.com>
|
||||
Date: Thu, 9 Oct 2025 18:09:25 -0400
|
||||
Subject: [PATCH] Increase `cmake_minimum_required`: 3.1 -> 3.10
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 246923d..14e1151 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@ IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
|
||||
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
|
||||
ENDIF()
|
||||
|
||||
-cmake_minimum_required(VERSION 3.1)
|
||||
+cmake_minimum_required(VERSION 3.1...3.10)
|
||||
IF (UNIX)
|
||||
OPTION(ADD_ASAN "Use ASAN to show memory issues" FALSE)
|
||||
OPTION(ADD_TSAN "Use TSAN to show thread issues" FALSE)
|
||||
@@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix for CMake v4
|
||||
# https://github.com/Nitrokey/libnitrokey/pull/226
|
||||
./cmake-v4.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -42,8 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
icu
|
||||
protobuf
|
||||
]
|
||||
++ lib.optionals enableTests [
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals enableTests [
|
||||
boost
|
||||
];
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libresplit";
|
||||
version = "0-unstable-2025-04-05";
|
||||
version = "0-unstable-2025-10-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wins1ey";
|
||||
repo = "LibreSplit";
|
||||
rev = "2dd5dfc684b777b814b4cbd3ea7fee8028157cd5";
|
||||
hash = "sha256-FHOX6trRjn+IoiVRdbV6mHUUAzxbRLDWluxGM1GxFVk=";
|
||||
rev = "0cb1b5d3eff0245fda17f734388eee609b9a4416";
|
||||
hash = "sha256-3DK+6pK0jSxy5s80u4lweMyiywknJPEG4rovhOPG4go=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+10
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libutp";
|
||||
version = "unstable-2017-01-02";
|
||||
version = "0-unstable-2017-01-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# Use transmission fork from post-3.3-transmission branch
|
||||
@@ -17,6 +17,15 @@ stdenv.mkDerivation {
|
||||
sha256 = "CvuZLOBksIl/lS6LaqOIuzNvX3ihlIPjI3Eqwo7YJH0=";
|
||||
};
|
||||
|
||||
# Compatibility with CMake < 3.5 has been removed from CMake.
|
||||
postPatch = ''
|
||||
substituteInPlace \
|
||||
CMakeLists.txt \
|
||||
--replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.8)" \
|
||||
"cmake_minimum_required(VERSION 3.5)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
@@ -48,6 +48,11 @@ stdenv.mkDerivation {
|
||||
./testsuite-newfstatat.patch
|
||||
# https://gitlab.com/cespedes/ltrace/-/merge_requests/15
|
||||
./sysdeps-x86.patch
|
||||
# print-instruction-pointer.exp doesn't expect ASLR
|
||||
(fetchurl {
|
||||
url = "https://github.com/gentoo/gentoo/raw/a2eb7e103ec985ff90f59e722e0a8a43373972a2/dev-debug/ltrace/files/ltrace-0.7.3-print-test-pie.patch";
|
||||
hash = "sha256-QRsUoN3WLzfiY5GDPwVYXtJPFMJt6rcc6eE96SAtI6Q=";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
pkg-config,
|
||||
autoconf-archive,
|
||||
libxml2,
|
||||
icu,
|
||||
ticcutils,
|
||||
timbl,
|
||||
frog,
|
||||
@@ -17,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mbt";
|
||||
version = "3.2.16";
|
||||
version = "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LanguageMachines";
|
||||
repo = "mbt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O/LhLWgLwDctkRYjds+AM9fGMIRX3eCnJhRIXyVrJ04=";
|
||||
hash = "sha256-7PpUa/WoPMjdADi1ongQkvqSDWPeb1dNsWee2hjGArk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libtool
|
||||
autoconf-archive
|
||||
libxml2
|
||||
icu
|
||||
ticcutils
|
||||
timbl
|
||||
];
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
love,
|
||||
lua,
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
strip-nondeterminism,
|
||||
zip,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "mrrescue";
|
||||
version = "1.02d";
|
||||
|
||||
icon = fetchurl {
|
||||
url = "http://tangramgames.dk/img/thumb/mrrescue.png";
|
||||
sha256 = "1y5ahf0m01i1ch03axhvp2kqc6lc1yvh59zgvgxw4w7y3jryw20k";
|
||||
@@ -19,7 +19,7 @@ let
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "mrrescue";
|
||||
exec = pname;
|
||||
exec = "mrrescue";
|
||||
icon = icon;
|
||||
comment = "Arcade-style fire fighting game";
|
||||
desktopName = "Mr. Rescue";
|
||||
@@ -30,30 +30,40 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
pname = "mrrescue";
|
||||
version = "1.02d-unstable-2018-08-18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
|
||||
sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimonLarsen";
|
||||
repo = "mrrescue";
|
||||
rev = "a5be73c60acb8d1be506f7b5e48e784492ba96ce";
|
||||
hash = "sha256-UDfMgE7LyyXioURclA56Kx+bTrwMNDPR3evCRJ3reRM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
lua
|
||||
love
|
||||
makeWrapper
|
||||
strip-nondeterminism
|
||||
zip
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
zip -9 -r mrrescue.love ./*
|
||||
strip-nondeterminism --type zip mrrescue.love
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/games/lovegames
|
||||
|
||||
cp -v $src $out/share/games/lovegames/${pname}.love
|
||||
cp -v mrrescue.love $out/share/games/lovegames/mrrescue.love
|
||||
|
||||
makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
|
||||
makeWrapper ${love}/bin/love $out/bin/mrrescue --add-flags $out/share/games/lovegames/mrrescue.love
|
||||
|
||||
chmod +x $out/bin/${pname}
|
||||
chmod +x $out/bin/mrrescue
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
'';
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mtail";
|
||||
version = "3.2.18";
|
||||
version = "3.2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z3FPZNWGyXtY2KLRF/oJIuN+lXE14SQce72pTKBsZEk=";
|
||||
hash = "sha256-rAN5k3XjDTSmdp2E5pa5W+nK4J8l5+sPqSFQRdjebmA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SMdEowzg53uori/Ge+GE4542wswBU2kgdyAXxeKQiiU=";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.12.2";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fhHkWkbMGLr/dlHFtbg/tZA0Yr8dKDKGiN//CNSVAOs=";
|
||||
hash = "sha256-uDCumcUNIMcvqYrV6iDMs4PSxuLodGzR/JyllwT6xn0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-53pIUVbGXU1GGFZtUtjSOufCbvHEPUltZd52eZEGSio=";
|
||||
vendorHash = "sha256-XzDIufMdDIaDfXrDutUak5/0nUo11RkD63c+Fpk76Xw=";
|
||||
|
||||
subPackages = [ "cmd/nelm" ];
|
||||
|
||||
|
||||
@@ -48,7 +48,6 @@ python3Packages.buildPythonApplication {
|
||||
mainProgram = "nile";
|
||||
homepage = "https://github.com/imLinguin/nile";
|
||||
license = with licenses; [ gpl3 ];
|
||||
maintainers = with maintainers; [ aidalgol ];
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
let
|
||||
# determine these versions from
|
||||
# curl -H 'Snap-Device-Series: 16' http://api.snapcraft.io/v2/snaps/info/nordpass
|
||||
version = "6.3.15";
|
||||
snapVersion = "201";
|
||||
version = "6.5.20";
|
||||
snapVersion = "203";
|
||||
snapId = "00CQ2MvSr0Ex7zwdGhCYTa0ZLMw3H6hf";
|
||||
snapBaseUrl = "https://api.snapcraft.io/api/v1/snaps/download/";
|
||||
|
||||
@@ -95,7 +95,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "${snapBaseUrl}${snapId}_${snapVersion}.snap";
|
||||
hash = "sha256-paOwigiDay0pBt7p3Jatv8/1GL8PKUddz9NzEngpGJI=";
|
||||
hash = "sha256-t78kbKVI9WAhL1+1qZ4tJWXUoXhXUCuUYobbbm09peA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ squashfsTools ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user