Merge master into haskell-updates
This commit is contained in:
@@ -732,7 +732,7 @@ writeShellApplication {
|
||||
|
||||
## `symlinkJoin` {#trivial-builder-symlinkJoin}
|
||||
|
||||
This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
|
||||
This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` (or alternatively `pname` and `version`) is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within.
|
||||
Here is an example:
|
||||
```nix
|
||||
# adds symlinks of hello and stack to current build and prints "links added"
|
||||
|
||||
@@ -15375,12 +15375,6 @@
|
||||
github = "niklaskorz";
|
||||
githubId = 590517;
|
||||
};
|
||||
NikolaMandic = {
|
||||
email = "nikola@mandic.email";
|
||||
github = "NikolaMandic";
|
||||
githubId = 4368690;
|
||||
name = "Ratko Mladic";
|
||||
};
|
||||
nikstur = {
|
||||
email = "nikstur@outlook.com";
|
||||
name = "nikstur";
|
||||
@@ -19610,10 +19604,11 @@
|
||||
};
|
||||
shadowrz = {
|
||||
email = "shadowrz+nixpkgs@disroot.org";
|
||||
matrix = "@ShadowRZ:matrixim.cc";
|
||||
matrix = "@shadowrz:nixos.dev";
|
||||
github = "ShadowRZ";
|
||||
githubId = 23130178;
|
||||
name = "夜坂雅";
|
||||
keys = [ { fingerprint = "3237 D49E 8F81 5A45 2133 64EA 4FF3 5790 F405 53A9"; } ];
|
||||
};
|
||||
shahrukh330 = {
|
||||
email = "shahrukh330@gmail.com";
|
||||
|
||||
@@ -190,6 +190,8 @@
|
||||
|
||||
- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret).
|
||||
|
||||
- [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
|
||||
|
||||
- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
|
||||
@@ -759,6 +761,8 @@
|
||||
- `services.localtimed.enable = true` will now set `time.timeZone = null`.
|
||||
This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part.
|
||||
|
||||
- `qgis` and `qgis-ltr` are now built without `grass` by default. `grass` support can be enabled with `qgis.override { withGrass = true; }`.
|
||||
|
||||
## Detailed migration information {#sec-release-24.11-migration}
|
||||
|
||||
### `sound` options removal {#sec-release-24.11-migration-sound}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.hardware.apple.touchBar;
|
||||
format = pkgs.formats.toml { };
|
||||
cfgFile = format.generate "config.toml" cfg.settings;
|
||||
in
|
||||
{
|
||||
options.hardware.apple.touchBar = {
|
||||
enable = lib.mkEnableOption "support for the Touch Bar on some Apple laptops using tiny-dfr";
|
||||
package = lib.mkPackageOption pkgs "tiny-dfr" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = format.type;
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for tiny-dfr. See [example configuration][1] for available options.
|
||||
|
||||
[1]: https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
MediaLayerDefault = true;
|
||||
ShowButtonOutlines = false;
|
||||
EnablePixelShift = true;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.packages = [ cfg.package ];
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
environment.etc."tiny-dfr/config.toml".source = cfgFile;
|
||||
systemd.services.tiny-dfr.restartTriggers = [ cfgFile ];
|
||||
};
|
||||
}
|
||||
@@ -48,6 +48,7 @@
|
||||
./config/zram.nix
|
||||
./hardware/acpilight.nix
|
||||
./hardware/all-firmware.nix
|
||||
./hardware/apple-touchbar.nix
|
||||
./hardware/bladeRF.nix
|
||||
./hardware/brillo.nix
|
||||
./hardware/ckb-next.nix
|
||||
|
||||
@@ -4,7 +4,7 @@ let
|
||||
cfg = config.services.buildbot-master;
|
||||
opt = options.services.buildbot-master;
|
||||
|
||||
package = pkgs.python3.pkgs.toPythonModule cfg.package;
|
||||
package = cfg.package.python.pkgs.toPythonModule cfg.package;
|
||||
python = package.pythonModule;
|
||||
|
||||
escapeStr = lib.escape [ "'" ];
|
||||
|
||||
@@ -36,7 +36,9 @@ let
|
||||
} // cfg.extraSettings;
|
||||
serverSettingsString = builtins.toJSON (lib.filterAttrsRecursive (n: v: v != null) serverSettings);
|
||||
serverSettingsFile = pkgs.writeText "server-settings.json" serverSettingsString;
|
||||
serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins);
|
||||
playerListOption = name: list:
|
||||
lib.optionalString (list != [])
|
||||
"--${name}=${pkgs.writeText "${name}.json" (builtins.toJSON list)}";
|
||||
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods cfg.mods-dat;
|
||||
in
|
||||
{
|
||||
@@ -59,6 +61,30 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
allowedPlayers = lib.mkOption {
|
||||
# I would personally prefer for `allowedPlayers = []` to mean "no-one
|
||||
# can connect" but Factorio seems to ignore empty whitelists (even with
|
||||
# --use-server-whitelist) so we can't implement that behaviour, so we
|
||||
# might as well match theirs.
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [];
|
||||
example = [ "Rseding91" "Oxyd" ];
|
||||
description = ''
|
||||
If non-empty, only these player names are allowed to connect. The game
|
||||
will not be able to save any changes made in-game with the /whitelist
|
||||
console command, though they will still take effect until the server
|
||||
is restarted.
|
||||
|
||||
If empty, the whitelist defaults to open, but can be managed with the
|
||||
in-game /whitelist console command (see: /help whitelist), which will
|
||||
cause changes to be saved to the game's state directory (see also:
|
||||
`stateDirName`).
|
||||
'';
|
||||
};
|
||||
# Opting not to include the banlist in addition the the whitelist because:
|
||||
# - banlists are not as often known in advance,
|
||||
# - losing banlist changes on restart seems much more of a headache.
|
||||
|
||||
admins = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [];
|
||||
@@ -177,7 +203,7 @@ in
|
||||
extraSettings = lib.mkOption {
|
||||
type = lib.types.attrs;
|
||||
default = {};
|
||||
example = { admins = [ "username" ];};
|
||||
example = { max_players = 64; };
|
||||
description = ''
|
||||
Extra game configuration that will go into server-settings.json
|
||||
'';
|
||||
@@ -298,7 +324,9 @@ in
|
||||
}"
|
||||
(lib.optionalString cfg.loadLatestSave "--start-server-load-latest")
|
||||
(lib.optionalString (cfg.mods != []) "--mod-directory=${modDir}")
|
||||
(lib.optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}")
|
||||
(playerListOption "server-adminlist" cfg.admins)
|
||||
(playerListOption "server-whitelist" cfg.allowedPlayers)
|
||||
(lib.optionalString (cfg.allowedPlayers != []) "--use-server-whitelist")
|
||||
];
|
||||
|
||||
# Sandboxing
|
||||
|
||||
@@ -26,7 +26,7 @@ in
|
||||
How often or when garbage collection is performed. For most desktop and server systems
|
||||
a sufficient garbage collection is once a week.
|
||||
|
||||
The format is described in
|
||||
This value must be a calendar event in the format specified by
|
||||
{manpage}`systemd.time(7)`.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -31,6 +31,20 @@ in
|
||||
Enable GPU monitoring.
|
||||
'';
|
||||
};
|
||||
temperature = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Enable temperature monitoring.
|
||||
'';
|
||||
};
|
||||
useIPv6CountryCode = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Use ipv6 countrycode to report location.
|
||||
'';
|
||||
};
|
||||
disableCommandExecute = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
@@ -96,7 +110,7 @@ in
|
||||
startLimitBurst = 3;
|
||||
script = lib.concatStringsSep " " (
|
||||
[
|
||||
"${cfg.package}/bin/agent"
|
||||
"${lib.getExe cfg.package}"
|
||||
"--disable-auto-update"
|
||||
"--disable-force-update"
|
||||
"--password $(cat ${cfg.passwordFile})"
|
||||
@@ -109,6 +123,8 @@ in
|
||||
++ lib.optional cfg.skipProcess "--skip-procs"
|
||||
++ lib.optional cfg.tls "--tls"
|
||||
++ lib.optional cfg.gpu "--gpu"
|
||||
++ lib.optional cfg.temperature "--temperature"
|
||||
++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"
|
||||
);
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
@@ -50,6 +50,7 @@ let
|
||||
"junos-czerwonk"
|
||||
"kea"
|
||||
"keylight"
|
||||
"klipper"
|
||||
"knot"
|
||||
"lnd"
|
||||
"mail"
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.klipper;
|
||||
inherit (lib)
|
||||
mkOption
|
||||
mkMerge
|
||||
mkIf
|
||||
types
|
||||
concatStringsSep
|
||||
any
|
||||
optionalString
|
||||
;
|
||||
moonraker = config.services.moonraker;
|
||||
in
|
||||
{
|
||||
port = 9101;
|
||||
extraOpts = {
|
||||
package = lib.mkPackageOption pkgs "prometheus-klipper-exporter" { };
|
||||
|
||||
moonrakerApiKey = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
API Key to authenticate with the Moonraker APIs.
|
||||
Only needed if the host running the exporter is not a trusted client to Moonraker.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = mkMerge (
|
||||
[
|
||||
{
|
||||
serviceConfig = {
|
||||
ExecStart = concatStringsSep " " [
|
||||
"${cfg.package}/bin/prometheus-klipper-exporter"
|
||||
(optionalString (cfg.moonrakerApiKey != "") "--moonraker.apikey ${cfg.moonrakerApiKey}")
|
||||
"--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
|
||||
"${concatStringsSep " " cfg.extraFlags}"
|
||||
];
|
||||
};
|
||||
}
|
||||
]
|
||||
++ [
|
||||
(mkIf config.services.moonraker.enable {
|
||||
after = [ "moonraker.service" ];
|
||||
requires = [ "moonraker.service" ];
|
||||
})
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -282,6 +282,7 @@ in
|
||||
ExecStart = lib.getExe cfg.package;
|
||||
EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile;
|
||||
StateDirectory = "immich";
|
||||
SyslogIdentifier = "immich";
|
||||
RuntimeDirectory = "immich";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
||||
@@ -699,8 +699,8 @@ in {
|
||||
nixops = handleTest ./nixops/default.nix {};
|
||||
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
|
||||
nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {};
|
||||
nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {};
|
||||
nixos-rebuild-target-host = handleTest ./nixos-rebuild-target-host.nix {};
|
||||
nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix;
|
||||
nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix;
|
||||
nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
|
||||
nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {};
|
||||
node-red = handleTest ./node-red.nix {};
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
{ hostPkgs, ... }: {
|
||||
name = "nixos-rebuild-specialisations";
|
||||
|
||||
# TODO: remove overlay from nixos/modules/profiles/installation-device.nix
|
||||
# make it a _small package instead, then remove pkgsReadOnly = false;.
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes = {
|
||||
machine = { lib, pkgs, ... }: {
|
||||
imports = [
|
||||
@@ -32,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
|
||||
testScript =
|
||||
let
|
||||
configFile = pkgs.writeText "configuration.nix" ''
|
||||
configFile = hostPkgs.writeText "configuration.nix" ''
|
||||
{ lib, pkgs, ... }: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
@@ -119,4 +123,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
machine.fail("nixos-rebuild boot --specialisation foo")
|
||||
machine.fail("nixos-rebuild boot -c foo")
|
||||
'';
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
{ hostPkgs, ... }: {
|
||||
name = "nixos-rebuild-target-host";
|
||||
|
||||
# TODO: remove overlay from nixos/modules/profiles/installation-device.nix
|
||||
# make it a _small package instead, then remove pkgsReadOnly = false;.
|
||||
node.pkgsReadOnly = false;
|
||||
|
||||
nodes = {
|
||||
deployer = { lib, ... }: let
|
||||
deployer = { lib, pkgs, ... }: let
|
||||
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
|
||||
in {
|
||||
imports = [ ../modules/profiles/installation-device.nix ];
|
||||
@@ -24,7 +28,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
|
||||
system.build.privateKey = snakeOilPrivateKey;
|
||||
system.build.publicKey = snakeOilPublicKey;
|
||||
# needed to provide STC implementation for target
|
||||
# We don't switch on `deployer`, but we need it to have the dependencies
|
||||
# available, to be picked up by system.includeBuildDependencies above.
|
||||
system.switch.enable = true;
|
||||
};
|
||||
|
||||
@@ -57,6 +62,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
system.build = {
|
||||
inherit targetConfig;
|
||||
};
|
||||
system.switch.enable = true;
|
||||
|
||||
networking.hostName = "target";
|
||||
}
|
||||
@@ -71,13 +77,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
StrictHostKeyChecking=no
|
||||
'';
|
||||
|
||||
targetConfigJSON = pkgs.writeText "target-configuration.json"
|
||||
targetConfigJSON = hostPkgs.writeText "target-configuration.json"
|
||||
(builtins.toJSON nodes.target.system.build.targetConfig);
|
||||
|
||||
targetNetworkJSON = pkgs.writeText "target-network.json"
|
||||
targetNetworkJSON = hostPkgs.writeText "target-network.json"
|
||||
(builtins.toJSON nodes.target.system.build.networkConfig);
|
||||
|
||||
configFile = hostname: pkgs.writeText "configuration.nix" ''
|
||||
configFile = hostname: hostPkgs.writeText "configuration.nix" ''
|
||||
{ lib, modulesPath, ... }: {
|
||||
imports = [
|
||||
(modulesPath + "/virtualisation/qemu-vm.nix")
|
||||
@@ -140,4 +146,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
deployer.succeed(f"mkdir -p {tmp_dir}")
|
||||
deployer.succeed(f"TMPDIR={tmp_dir} nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console")
|
||||
'';
|
||||
})
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://xiph.org/flac/";
|
||||
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
|
||||
changelog = "https://xiph.org/flac/changelog.html";
|
||||
mainProgram = "flac";
|
||||
platforms = platforms.all;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ruuda ];
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3
|
||||
, serd, sord , sratom, suil, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jalv";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [
|
||||
gtk2 libjack2 lilv lv2 python3 serd sord sratom suil
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple but fully featured LV2 host for Jack";
|
||||
homepage = "http://drobilla.net/software/jalv";
|
||||
license = licenses.isc;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -49,8 +49,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = ''A real-time graphical programming environment for
|
||||
audio, video, and graphical processing'';
|
||||
description = ''A real-time graphical programming environment for audio, video, and graphical processing'';
|
||||
homepage = "http://puredata.info";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
|
||||
@@ -36,10 +36,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''(
|
||||
set -x
|
||||
test -e $out/bin/setBfreeUI
|
||||
)'';
|
||||
installCheckPhase = ''
|
||||
(
|
||||
set -x;
|
||||
test -e $out/bin/setBfreeUI
|
||||
)
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.9.1";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-PlwpN8P1t0NNIU+Ys50dIXmfUQFIY9e1tLABiVK0JQo=";
|
||||
hash = "sha256-pAmstWA6up0CvHEQW5RnDYumdwKP0i6fpz59EYTBsmU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-n1uJ/dkEjjsTdmL7TeHU4PKnBhiRrqCNtcGxK70Q0c4=";
|
||||
vendorHash = "sha256-Sr9OECXbRa4SPe3owMto2EbnAIygeIEmZv73hvA6iww=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
||||
+28
-26
@@ -788,7 +788,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "asset-hub-rococo-runtime"
|
||||
version = "0.22.0"
|
||||
version = "0.22.1"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"assets-common",
|
||||
@@ -920,7 +920,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "asset-hub-westend-runtime"
|
||||
version = "0.26.0"
|
||||
version = "0.26.1"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"assets-common",
|
||||
@@ -1752,7 +1752,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bp-header-chain"
|
||||
version = "0.18.0"
|
||||
version = "0.18.1"
|
||||
dependencies = [
|
||||
"bp-runtime",
|
||||
"bp-test-utils",
|
||||
@@ -2034,6 +2034,7 @@ dependencies = [
|
||||
"staging-xcm",
|
||||
"staging-xcm-executor",
|
||||
"testnet-parachains-constants",
|
||||
"xcm-runtime-apis",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2227,6 +2228,7 @@ dependencies = [
|
||||
"staging-xcm",
|
||||
"staging-xcm-executor",
|
||||
"testnet-parachains-constants",
|
||||
"xcm-runtime-apis",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3980,7 +3982,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-client-service"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"cumulus-client-cli",
|
||||
"cumulus-client-collator",
|
||||
@@ -4050,7 +4052,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-pallet-parachain-system"
|
||||
version = "0.17.0"
|
||||
version = "0.17.1"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"bytes",
|
||||
@@ -4298,7 +4300,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-relay-chain-inprocess-interface"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"cumulus-primitives-core",
|
||||
@@ -4344,7 +4346,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cumulus-relay-chain-minimal-node"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"async-trait",
|
||||
@@ -5117,7 +5119,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "emulated-integration-tests-common"
|
||||
version = "14.0.0"
|
||||
version = "14.1.0"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"bp-messages",
|
||||
@@ -8766,7 +8768,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mmr-rpc"
|
||||
version = "37.0.0"
|
||||
version = "38.0.0"
|
||||
dependencies = [
|
||||
"jsonrpsee",
|
||||
"parity-scale-codec",
|
||||
@@ -10844,7 +10846,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pallet-message-queue"
|
||||
version = "41.0.0"
|
||||
version = "41.0.1"
|
||||
dependencies = [
|
||||
"environmental",
|
||||
"frame-benchmarking",
|
||||
@@ -12035,7 +12037,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pallet-xcm-bridge-hub-router"
|
||||
version = "0.15.0"
|
||||
version = "0.15.1"
|
||||
dependencies = [
|
||||
"bp-xcm-bridge-hub-router",
|
||||
"frame-benchmarking",
|
||||
@@ -12869,7 +12871,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot"
|
||||
version = "17.0.0"
|
||||
version = "18.0.0"
|
||||
dependencies = [
|
||||
"assert_cmd",
|
||||
"color-eyre",
|
||||
@@ -13021,7 +13023,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-cli"
|
||||
version = "18.0.0"
|
||||
version = "19.0.0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"clap 4.5.11",
|
||||
@@ -13695,7 +13697,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-node-network-protocol"
|
||||
version = "18.0.0"
|
||||
version = "18.0.1"
|
||||
dependencies = [
|
||||
"async-channel",
|
||||
"async-trait",
|
||||
@@ -13875,7 +13877,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-parachain-bin"
|
||||
version = "6.0.0"
|
||||
version = "7.0.0"
|
||||
dependencies = [
|
||||
"asset-hub-rococo-runtime",
|
||||
"asset-hub-westend-runtime",
|
||||
@@ -13913,7 +13915,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-parachain-lib"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
dependencies = [
|
||||
"assert_cmd",
|
||||
"async-trait",
|
||||
@@ -14037,7 +14039,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-rpc"
|
||||
version = "18.0.0"
|
||||
version = "19.0.0"
|
||||
dependencies = [
|
||||
"jsonrpsee",
|
||||
"mmr-rpc",
|
||||
@@ -14137,7 +14139,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-runtime-parachains"
|
||||
version = "17.0.0"
|
||||
version = "17.0.1"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"bitflags 1.3.2",
|
||||
@@ -14197,7 +14199,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-sdk"
|
||||
version = "0.6.0"
|
||||
version = "0.7.0"
|
||||
dependencies = [
|
||||
"asset-test-utils",
|
||||
"assets-common",
|
||||
@@ -14699,7 +14701,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polkadot-service"
|
||||
version = "18.0.0"
|
||||
version = "19.0.0"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"async-trait",
|
||||
@@ -17311,7 +17313,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-client-db"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"criterion",
|
||||
@@ -17856,7 +17858,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network"
|
||||
version = "0.45.0"
|
||||
version = "0.45.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"assert_matches",
|
||||
@@ -17961,7 +17963,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network-light"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"async-channel",
|
||||
@@ -18000,7 +18002,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network-sync"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"async-channel",
|
||||
@@ -18072,7 +18074,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sc-network-transactions"
|
||||
version = "0.44.0"
|
||||
version = "0.44.1"
|
||||
dependencies = [
|
||||
"array-bytes",
|
||||
"futures",
|
||||
@@ -20992,7 +20994,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "staging-xcm-builder"
|
||||
version = "17.0.0"
|
||||
version = "17.0.1"
|
||||
dependencies = [
|
||||
"assert_matches",
|
||||
"frame-support",
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, rocksdb_8_3
|
||||
, rust-jemalloc-sys-unprefixed
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, stdenv
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
openssl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
rocksdb_8_3,
|
||||
rust-jemalloc-sys-unprefixed,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
stdenv,
|
||||
Security,
|
||||
SystemConfiguration,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -17,13 +18,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "stable2409";
|
||||
version = "stable2409-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot-sdk";
|
||||
rev = "polkadot-${version}";
|
||||
hash = "sha256-QNjk2lb04VLYpwbE7hmUVaujijX9nkZxVdseTS1G85E=";
|
||||
hash = "sha256-SbQaauElMNuCg0q6aN0ckg39huNZyiq8px9iXWFFtyc=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
@@ -53,7 +54,10 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildType = "production";
|
||||
|
||||
cargoBuildFlags = [ "-p" "polkadot" ];
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"polkadot"
|
||||
];
|
||||
|
||||
# NOTE: tests currently fail to compile due to an issue with cargo-auditable
|
||||
# and resolution of features flags, potentially related to this:
|
||||
@@ -68,9 +72,13 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
# NOTE: jemalloc is used by default on Linux with unprefixed enabled
|
||||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ];
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
# NOTE: disable building `core`/`std` in wasm environment since rust-src isn't
|
||||
# available for `rustc-wasm32`
|
||||
@@ -84,8 +92,15 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Polkadot Node Implementation";
|
||||
homepage = "https://polkadot.network";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ];
|
||||
maintainers = with maintainers; [
|
||||
akru
|
||||
andresilva
|
||||
FlorianFranzen
|
||||
RaghavSood
|
||||
];
|
||||
# See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta.
|
||||
platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86);
|
||||
platforms = intersectLists platforms.unix (
|
||||
platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -99,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://libresprite.github.io/";
|
||||
description = "Animated sprite editor & pixel art tool, fork of Aseprite";
|
||||
license = licenses.gpl2Only;
|
||||
longDescription =
|
||||
''LibreSprite is a program to create animated sprites. Its main features are:
|
||||
longDescription = ''
|
||||
LibreSprite is a program to create animated sprites. Its main features are:
|
||||
|
||||
- Sprites are composed by layers & frames (as separated concepts).
|
||||
- Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale.
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "scite";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.scintilla.org/scite522.tgz";
|
||||
sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 ];
|
||||
sourceRoot = "scintilla/gtk";
|
||||
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'intptr_t' does not name a type
|
||||
"-include cstdint"
|
||||
"-include system_error"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
make
|
||||
cd ../../lexilla/src
|
||||
make
|
||||
cd ../../scite/gtk
|
||||
make prefix=$out/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make install prefix=$out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.scintilla.org/SciTE.html";
|
||||
description = "SCIntilla based Text Editor";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.rszibele ];
|
||||
mainProgram = "SciTE";
|
||||
};
|
||||
}
|
||||
@@ -43,25 +43,25 @@ rec {
|
||||
|
||||
meta = {
|
||||
description = "WYSIWYW editing platform with special features for scientists";
|
||||
longDescription =
|
||||
'' GNU TeXmacs is a free wysiwyw (what you see is what you want)
|
||||
editing platform with special features for scientists. The software
|
||||
aims to provide a unified and user friendly framework for editing
|
||||
structured documents with different types of content (text,
|
||||
graphics, mathematics, interactive content, etc.). The rendering
|
||||
engine uses high-quality typesetting algorithms so as to produce
|
||||
professionally looking documents, which can either be printed out or
|
||||
presented from a laptop.
|
||||
longDescription = ''
|
||||
GNU TeXmacs is a free wysiwyw (what you see is what you want)
|
||||
editing platform with special features for scientists. The software
|
||||
aims to provide a unified and user friendly framework for editing
|
||||
structured documents with different types of content (text,
|
||||
graphics, mathematics, interactive content, etc.). The rendering
|
||||
engine uses high-quality typesetting algorithms so as to produce
|
||||
professionally looking documents, which can either be printed out or
|
||||
presented from a laptop.
|
||||
|
||||
The software includes a text editor with support for mathematical
|
||||
formulas, a small technical picture editor and a tool for making
|
||||
presentations from a laptop. Moreover, TeXmacs can be used as an
|
||||
interface for many external systems for computer algebra, numerical
|
||||
analysis, statistics, etc. New presentation styles can be written
|
||||
by the user and new features can be added to the editor using the
|
||||
Scheme extension language. A native spreadsheet and tools for
|
||||
collaborative authoring are planned for later.
|
||||
'';
|
||||
The software includes a text editor with support for mathematical
|
||||
formulas, a small technical picture editor and a tool for making
|
||||
presentations from a laptop. Moreover, TeXmacs can be used as an
|
||||
interface for many external systems for computer algebra, numerical
|
||||
analysis, statistics, etc. New presentation styles can be written
|
||||
by the user and new features can be added to the editor using the
|
||||
Scheme extension language. A native spreadsheet and tools for
|
||||
collaborative authoring are planned for later.
|
||||
'';
|
||||
homepage = "http://texmacs.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
@@ -18756,5 +18756,17 @@ final: prev:
|
||||
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
|
||||
};
|
||||
|
||||
NotebookNavigator-nvim = buildVimPlugin {
|
||||
pname = "NotebookNavigator.nvim";
|
||||
version = "2024-05-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GCBallesteros";
|
||||
repo = "NotebookNavigator.nvim";
|
||||
rev = "20cb6f72939194e32eb3060578b445e5f2e7ae8b";
|
||||
sha256 = "sha256-+FLHJ1tfIplXhO/6kajdcDBTIsNYN9kCOR9IdhXL6d4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/GCBallesteros/NotebookNavigator.nvim";
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -149,8 +149,7 @@ in
|
||||
vim-fugitive
|
||||
vim-rhubarb
|
||||
];
|
||||
# TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
|
||||
# nvimRequireCheck = "advanced_git_search.utils";
|
||||
nvimRequireCheck = "advanced_git_search.utils";
|
||||
};
|
||||
|
||||
animation-nvim = super.animation-nvim.overrideAttrs {
|
||||
@@ -236,8 +235,7 @@ in
|
||||
plenary-nvim
|
||||
telescope-nvim
|
||||
];
|
||||
# TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
|
||||
# nvimRequireCheck = "chatgpt";
|
||||
nvimRequireCheck = "chatgpt";
|
||||
};
|
||||
|
||||
clang_complete = super.clang_complete.overrideAttrs {
|
||||
@@ -1529,6 +1527,10 @@ in
|
||||
nvimRequireCheck = "null-ls";
|
||||
};
|
||||
|
||||
NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs {
|
||||
nvimRequireCheck = "notebook-navigator";
|
||||
};
|
||||
|
||||
null-ls-nvim = super.null-ls-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
nvimRequireCheck = "null-ls";
|
||||
@@ -1588,8 +1590,7 @@ in
|
||||
nvim-lspconfig
|
||||
nvim-navic
|
||||
];
|
||||
# TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
|
||||
# nvimRequireCheck = "nvim-navbuddy";
|
||||
nvimRequireCheck = "nvim-navbuddy";
|
||||
};
|
||||
|
||||
vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
|
||||
|
||||
@@ -19,6 +19,7 @@ https://github.com/Yggdroot/LeaderF/,,
|
||||
https://github.com/Valloric/MatchTagAlways/,,
|
||||
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/vim-scripts/PreserveNoEOL/,,
|
||||
https://github.com/henriklovhaug/Preview.nvim/,HEAD,
|
||||
|
||||
@@ -697,8 +697,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "biome";
|
||||
publisher = "biomejs";
|
||||
version = "2024.5.251958";
|
||||
hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo=";
|
||||
version = "2024.10.131712";
|
||||
hash = "sha256-wslaPz0YwavLgP/gLXDIKsk2dvVmFgkSDCI9OfpKwwI=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md";
|
||||
@@ -5194,8 +5194,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-icons";
|
||||
publisher = "vscode-icons-team";
|
||||
version = "12.8.0";
|
||||
hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM=";
|
||||
version = "12.9.0";
|
||||
hash = "sha256-ULjZlbGcVbPiokfnx7d4z7cmVVEfy2d+SUch80rZRA4=";
|
||||
};
|
||||
meta = {
|
||||
description = "Bring real icons to your Visual Studio Code";
|
||||
|
||||
@@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.19";
|
||||
version = "9.20";
|
||||
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-LBOgw/MfJaVNQV2GeFoa1G74oHrpc7a2mTRaRSBqwBU=";
|
||||
hash = "sha256-lfK0WxRYElvn2fzMlMpfjM4KXkrhHQ0ZPPt93bNeeoY=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitLab rec {
|
||||
# https://gitlab.winehq.org/wine/wine-staging
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-TKW8y8kPsI0af/nEr3rU9nH49I77u+/6CHE64JgdkOU=";
|
||||
hash = "sha256-ewozuCtYPaV9d4XD9sdRGMfJcBIE13TC5vNEWdbcGCs=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
, libsForQt5
|
||||
|
||||
# unwrapped package parameters
|
||||
, withGrass ? true
|
||||
, withGrass ? false
|
||||
, withWebKit ? false
|
||||
}:
|
||||
let
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
, libsForQt5
|
||||
|
||||
# unwrapped package parameters
|
||||
, withGrass ? true
|
||||
, withGrass ? false
|
||||
, withWebKit ? false
|
||||
}:
|
||||
let
|
||||
|
||||
@@ -16,18 +16,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optical character recognition (OCR) program & library";
|
||||
longDescription =
|
||||
'' GNU Ocrad is an OCR (Optical Character Recognition) program based on
|
||||
a feature extraction method. It reads images in pbm (bitmap), pgm
|
||||
(greyscale) or ppm (color) formats and produces text in byte (8-bit)
|
||||
or UTF-8 formats.
|
||||
longDescription = ''
|
||||
GNU Ocrad is an OCR (Optical Character Recognition) program based on
|
||||
a feature extraction method. It reads images in pbm (bitmap), pgm
|
||||
(greyscale) or ppm (color) formats and produces text in byte (8-bit)
|
||||
or UTF-8 formats.
|
||||
|
||||
Also includes a layout analyser able to separate the columns or
|
||||
blocks of text normally found on printed pages.
|
||||
Also includes a layout analyser able to separate the columns or
|
||||
blocks of text normally found on printed pages.
|
||||
|
||||
Ocrad can be used as a stand-alone console application, or as a
|
||||
backend to other programs.
|
||||
'';
|
||||
Ocrad can be used as a stand-alone console application, or as a
|
||||
backend to other programs.
|
||||
'';
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
|
||||
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and simple image viewer";
|
||||
longDescription =
|
||||
'' Viewnior is insipred by big projects like Eye of Gnome, because of it's
|
||||
usability and richness,and by GPicView, because of it's lightweight design and
|
||||
minimal interface. So here comes Viewnior - small and light, with no compromise
|
||||
with the quality of it's functions. The program is made with better integration
|
||||
in mind (follows Gnome HIG2).
|
||||
'';
|
||||
longDescription = ''
|
||||
Viewnior is insipred by big projects like Eye of Gnome, because of it's
|
||||
usability and richness,and by GPicView, because of it's lightweight design and
|
||||
minimal interface. So here comes Viewnior - small and light, with no compromise
|
||||
with the quality of it's functions. The program is made with better integration
|
||||
in mind (follows Gnome HIG2).
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://siyanpanayotov.com/project/viewnior/";
|
||||
maintainers = with maintainers; [ smironov artturin ];
|
||||
|
||||
@@ -9,9 +9,10 @@ mkDerivation {
|
||||
homepage = "https://apps.kde.org/picmi/";
|
||||
description = "Nonogram game";
|
||||
mainProgram = "picmi";
|
||||
longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or
|
||||
longDescription = ''
|
||||
The goal is to reveal the hidden pattern in the board by coloring or
|
||||
leaving blank the cells in a grid according to numbers given at the side of the grid.
|
||||
'';
|
||||
'';
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -146,6 +146,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://keepassxc.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "keepassxc";
|
||||
maintainers = with maintainers; [ blankparticle ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
pkgs,
|
||||
mkDerivation,
|
||||
lib,
|
||||
callPackage,
|
||||
@@ -17,15 +18,17 @@
|
||||
libevdev,
|
||||
makeDesktopItem,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
wineWowPackages,
|
||||
}: let
|
||||
version = "2022.3.0";
|
||||
version = "2023.3.0";
|
||||
|
||||
aruco = callPackage ./aruco.nix {};
|
||||
|
||||
# license.txt inside the zip file is MIT
|
||||
xplaneSdk = fetchzip {
|
||||
url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip";
|
||||
sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba";
|
||||
url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip";
|
||||
hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo=";
|
||||
};
|
||||
in
|
||||
mkDerivation {
|
||||
@@ -36,19 +39,30 @@ in
|
||||
owner = "opentrack";
|
||||
repo = "opentrack";
|
||||
rev = "opentrack-${version}";
|
||||
sha256 = "sha256-8gpNORTJclYUYp57Vw/0YO3XC9Idurt0a79fhqx0+mo=";
|
||||
hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/opentrack/opentrack/pull/1754
|
||||
(fetchpatch {
|
||||
url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch";
|
||||
hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems];
|
||||
buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco];
|
||||
buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]
|
||||
++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
|
||||
dontWrapQtApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-GNinja"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
|
||||
"-DSDK_XPLANE=${xplaneSdk}"
|
||||
];
|
||||
] ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapQtApp $out/bin/opentrack
|
||||
@@ -60,7 +74,7 @@ in
|
||||
exec = "opentrack";
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";
|
||||
sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn";
|
||||
hash = "sha256-9k3jToEpdW14ErbNGHM4c0x/LH7k14RmtvY4dOYnITQ=";
|
||||
};
|
||||
desktopName = name;
|
||||
genericName = "Head tracking software";
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxker";
|
||||
version = "0.7.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w=";
|
||||
hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo=";
|
||||
cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple tui to view & control docker containers";
|
||||
|
||||
@@ -116,7 +116,7 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
# check phase uses the output bin, which is not possible when cross-compiling
|
||||
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
@@ -34,16 +34,16 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Lexical database for the English language";
|
||||
|
||||
longDescription =
|
||||
'' WordNet® is a large lexical database of English. Nouns, verbs,
|
||||
adjectives and adverbs are grouped into sets of cognitive synonyms
|
||||
(synsets), each expressing a distinct concept. Synsets are
|
||||
interlinked by means of conceptual-semantic and lexical relations.
|
||||
The resulting network of meaningfully related words and concepts can
|
||||
be navigated with the browser. WordNet is also freely and publicly
|
||||
available for download. WordNet's structure makes it a useful tool
|
||||
for computational linguistics and natural language processing.
|
||||
'';
|
||||
longDescription = ''
|
||||
WordNet® is a large lexical database of English. Nouns, verbs,
|
||||
adjectives and adverbs are grouped into sets of cognitive synonyms
|
||||
(synsets), each expressing a distinct concept. Synsets are
|
||||
interlinked by means of conceptual-semantic and lexical relations.
|
||||
The resulting network of meaningfully related words and concepts can
|
||||
be navigated with the browser. WordNet is also freely and publicly
|
||||
available for download. WordNet's structure makes it a useful tool
|
||||
for computational linguistics and natural language processing.
|
||||
'';
|
||||
|
||||
homepage = "https://wordnet.princeton.edu/";
|
||||
license = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -35,11 +35,11 @@
|
||||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "132.0b5";
|
||||
version = "132.0b9";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "7b9b3120ce3f5918bb0a6d385b23503ff2dbd0b6171d63ce6310eca43d252537b43cc79ace326d2e29611ae4fb06d815bcaefb63c6942d00e53277deeb0eba70";
|
||||
sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -64,13 +64,13 @@
|
||||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "132.0b5";
|
||||
version = "132.0b9";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "3c2f028ae1d2ebf01a4fc341ee7f706bfdacb0c4dd2db2e3f24b42fe1e4e89f67a3827ad794c557c084a723272928264ae9e0bf67a4268078ebd8e4af1f97688";
|
||||
sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.34";
|
||||
version = "0.6.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-rbZySF7DrBN37YIetFXZE/aPSRex5cQnV8FZ0KDQ71k=";
|
||||
hash = "sha256-ohT4h9w6gaOk6C3O8eUBcmXHRSzL2mcRO8RnNY8htso=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -29,7 +29,7 @@ buildGoModule rec {
|
||||
|
||||
doCheck = false; # requires docker, container-diff (unpackaged yet)
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
for shell in bash fish zsh; do
|
||||
$out/bin/executor completion $shell > executor.$shell
|
||||
installShellCompletion executor.$shell
|
||||
|
||||
@@ -29,7 +29,7 @@ buildGoModule rec {
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd kubeshark \
|
||||
--bash <($out/bin/kubeshark completion bash) \
|
||||
--fish <($out/bin/kubeshark completion fish) \
|
||||
|
||||
@@ -40,7 +40,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd vela \
|
||||
--bash <($out/bin/vela completion bash) \
|
||||
--zsh <($out/bin/vela completion zsh)
|
||||
|
||||
@@ -162,11 +162,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-ny/FjAStb4qUzVeAkkqgKDb5lzmR6e0J1RaG6CWBrYg=",
|
||||
"hash": "sha256-7Km+FqUyCCFzVmSpg4m7FuWs3MF+mKqPxEQApQqe35M=",
|
||||
"homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
|
||||
"owner": "F5Networks",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.22.4",
|
||||
"rev": "v1.22.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -399,13 +399,13 @@
|
||||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-FFUmNDP10Aqj5aBWuYYO1redZlXMNVLEskQAjPSgXoY=",
|
||||
"hash": "sha256-RlJsM5gZPHQxE7Lab2J1MVFL1YaSz2kC/1F68Nep1jc=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v2.8.0",
|
||||
"rev": "v2.9.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-k9NmPXtvjLDWDGMbloJwErNkzuJVe8T6lnlYE2iO5w4="
|
||||
"vendorHash": "sha256-D08K1+0m5HcLTr6VfP0adMdTBh6st4cQyWf95fd6GlY="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-fS7ZK+d7paUoaPuxXh6N6Sw38dzlxOAVCHgsHUL2Gz8=",
|
||||
@@ -994,13 +994,13 @@
|
||||
"vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ="
|
||||
},
|
||||
"postgresql": {
|
||||
"hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=",
|
||||
"hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=",
|
||||
"homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql",
|
||||
"owner": "cyrilgdn",
|
||||
"repo": "terraform-provider-postgresql",
|
||||
"rev": "v1.23.0",
|
||||
"rev": "v1.24.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI="
|
||||
"vendorHash": "sha256-2DWYW/NoNqchnfxEPBCFstzGuFKwXAXVmS9RqRWViWo="
|
||||
},
|
||||
"powerdns": {
|
||||
"hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=",
|
||||
|
||||
@@ -47,6 +47,14 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preBuild = ''
|
||||
python make.py build --dist unix
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
python make.py install --dist unix --prefix=$out
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
@@ -117,7 +117,7 @@ let
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
|
||||
'';
|
||||
|
||||
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
# In particular, this detects missing python imports in some of the tools.
|
||||
postFixup = let
|
||||
# TODO: python is a script, so it doesn't work as interpreter on darwin
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "rambox";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
|
||||
hash = "sha256-x9GDiSkkO0zYx/veB6xSr6/9/SW6JRTGAASlvWd/P0c=";
|
||||
hash = "sha256-ndFv5rNTWyqrGGC8t1JNR+bQC0Jsit4I9p4ng7h/gcU=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
"-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
nativeCheckInputs = [ check ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
, sphinx
|
||||
, sqlite
|
||||
, xdg-utils
|
||||
, qtwayland
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
@@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||
qtwebengine
|
||||
qtwebsockets
|
||||
sqlite
|
||||
qtwayland
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
|
||||
@@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "maxwell.ydns.eu/git";
|
||||
domain = "maxwell.eurofusion.eu/git";
|
||||
owner = "rnhmjoj";
|
||||
repo = "magnetico";
|
||||
rev = "v${version}";
|
||||
@@ -31,7 +31,7 @@ buildGoModule rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Autonomous (self-hosted) BitTorrent DHT search engine suite";
|
||||
homepage = "https://maxwell.ydns.eu/git/rnhmjoj/magnetico";
|
||||
homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/magnetico";
|
||||
license = licenses.agpl3Only;
|
||||
badPlatforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, autoreconfHook269
|
||||
, autoconf-archive
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, fribidi
|
||||
@@ -24,9 +26,12 @@ stdenv.mkDerivation rec {
|
||||
pname = "abiword";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "AbiWord";
|
||||
rev = "refs/tags/release-${version}";
|
||||
hash = "sha256-Z55qPm4MYwbG8bvXpX2TH8bxQaJjvb3Em1ymM1XwGqo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -38,6 +43,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook269
|
||||
autoconf-archive
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
perl
|
||||
@@ -62,10 +69,18 @@ stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./tools/cdump/xp/cdump.pl ./po/ui-backport.pl
|
||||
'';
|
||||
|
||||
preAutoreconf = ''
|
||||
./autogen-common.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Word processing program, similar to Microsoft Word";
|
||||
mainProgram = "abiword";
|
||||
homepage = "https://www.abisource.com/";
|
||||
homepage = "https://gitlab.gnome.org/World/AbiWord/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pSub ylwghst sna ];
|
||||
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
"kmymoney/plugins/woob/interface/kmymoneywoob.py"
|
||||
'';
|
||||
|
||||
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
nativeInstallCheckInputs = [ xvfb-run ];
|
||||
installCheckPhase =
|
||||
lib.optionalString doInstallCheck ''
|
||||
|
||||
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Amateur radio logging program";
|
||||
longDescription =
|
||||
'' Xlog is an amateur radio logging program.
|
||||
It supports cabrillo, ADIF, trlog (format also used by tlf),
|
||||
and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files.
|
||||
Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone,
|
||||
location in latitude and longitude and distance and heading in kilometers or miles,
|
||||
both for short and long path.
|
||||
'';
|
||||
longDescription = ''
|
||||
Xlog is an amateur radio logging program.
|
||||
It supports cabrillo, ADIF, trlog (format also used by tlf),
|
||||
and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files.
|
||||
Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone,
|
||||
location in latitude and longitude and distance and heading in kilometers or miles,
|
||||
both for short and long path.
|
||||
'';
|
||||
homepage = "https://www.nongnu.org/xlog";
|
||||
maintainers = [ maintainers.mafo ];
|
||||
license = licenses.gpl3;
|
||||
|
||||
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
|
||||
description = "sets the X root window to an image of the Earth";
|
||||
mainProgram = "xearth";
|
||||
homepage = "https://xearth.org";
|
||||
longDescription =
|
||||
'' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space,
|
||||
correctly shaded for the current position of the Sun.
|
||||
By default, xearth updates the displayed image every five minutes.
|
||||
'';
|
||||
longDescription = ''
|
||||
Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space,
|
||||
correctly shaded for the current position of the Sun.
|
||||
By default, xearth updates the displayed image every five minutes.
|
||||
'';
|
||||
maintainers = [ maintainers.mafo ];
|
||||
license = {
|
||||
fullName = "xearth license";
|
||||
|
||||
@@ -96,8 +96,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = ''Basic Local Alignment Search Tool (BLAST) finds regions of
|
||||
similarity between biological sequences'';
|
||||
description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences'';
|
||||
homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi";
|
||||
license = licenses.publicDomain;
|
||||
|
||||
|
||||
@@ -43,9 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = with lib; {
|
||||
description = "Computational Morphometry Toolkit";
|
||||
mainProgram = "cmtk";
|
||||
longDescription = ''A software toolkit for computational morphometry of
|
||||
longDescription = ''
|
||||
A software toolkit for computational morphometry of
|
||||
biomedical images, CMTK comprises a set of command line tools and a
|
||||
back-end general-purpose library for processing and I/O'';
|
||||
back-end general-purpose library for processing and I/O
|
||||
'';
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "European Molecular Biology Open Software Suite";
|
||||
longDescription = ''EMBOSS is a free Open Source software analysis package
|
||||
specially developed for the needs of the molecular biology (e.g. EMBnet)
|
||||
user community, including libraries. The software automatically copes with
|
||||
data in a variety of formats and even allows transparent retrieval of
|
||||
sequence data from the web.'';
|
||||
longDescription = ''
|
||||
EMBOSS is a free Open Source software analysis package
|
||||
specially developed for the needs of the molecular biology (e.g. EMBnet)
|
||||
user community, including libraries. The software automatically copes with
|
||||
data in a variety of formats and even allows transparent retrieval of
|
||||
sequence data from the web.
|
||||
'';
|
||||
license = lib.licenses.gpl2;
|
||||
homepage = "https://emboss.sourceforge.net/";
|
||||
};
|
||||
|
||||
@@ -25,14 +25,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.2.21";
|
||||
version = "16.3.1";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE=";
|
||||
hash = "sha256-mjID6o+2yhzKd1g3MO4as1dA11nhessjzCDHSUyUQBw=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
, zlib
|
||||
, gsl
|
||||
, ntl
|
||||
, jdk
|
||||
, jre8
|
||||
, less
|
||||
}:
|
||||
|
||||
@@ -96,7 +96,7 @@ let
|
||||
ecm
|
||||
lcalc
|
||||
rubiks
|
||||
jdk # only needed for `jmol` which may be replaced in the future
|
||||
jre8 # only needed for `jmol` (https://sourceforge.net/p/jmol/mailman/message/58818762/), which will be optional in sage 10.5
|
||||
less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
|
||||
]
|
||||
));
|
||||
|
||||
@@ -33,13 +33,13 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Visualization framework for the analysis and visualization of relational data";
|
||||
|
||||
longDescription =
|
||||
'' Tulip is an information visualization framework dedicated to the
|
||||
analysis and visualization of relational data. Tulip aims to
|
||||
provide the developer with a complete library, supporting the design
|
||||
of interactive information visualization applications for relational
|
||||
data that can be tailored to the problems he or she is addressing.
|
||||
'';
|
||||
longDescription = ''
|
||||
Tulip is an information visualization framework dedicated to the
|
||||
analysis and visualization of relational data. Tulip aims to
|
||||
provide the developer with a complete library, supporting the design
|
||||
of interactive information visualization applications for relational
|
||||
data that can be tailored to the problems he or she is addressing.
|
||||
'';
|
||||
|
||||
homepage = "http://tulip.labri.fr/";
|
||||
|
||||
|
||||
@@ -49,16 +49,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alacritty";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MrlzAZWLgfwIoTdxY+fjWbrv7tygAjnxXebiEgwOM9A=";
|
||||
hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7HPTELRlmyjj7CXNbgqrzxW548BgbxybWi+tT3rOCX0=";
|
||||
cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
configureFlags =
|
||||
lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
|
||||
|
||||
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/rcs/";
|
||||
description = "Revision control system";
|
||||
longDescription =
|
||||
'' The GNU Revision Control System (RCS) manages multiple revisions of
|
||||
files. RCS automates the storing, retrieval, logging,
|
||||
identification, and merging of revisions. RCS is useful for text
|
||||
that is revised frequently, including source code, programs,
|
||||
documentation, graphics, papers, and form letters.
|
||||
'';
|
||||
longDescription = ''
|
||||
The GNU Revision Control System (RCS) manages multiple revisions of
|
||||
files. RCS automates the storing, retrieval, logging,
|
||||
identification, and merging of revisions. RCS is useful for text
|
||||
that is revised frequently, including source code, programs,
|
||||
documentation, graphics, papers, and form letters.
|
||||
'';
|
||||
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
buildLua (finalAttrs: {
|
||||
pname = "modernx-zydezu";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
scriptPath = "modernx.lua";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zydezu";
|
||||
repo = "ModernX";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw=";
|
||||
hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
# feature, but rather to make the program more robustly self-
|
||||
# contained.
|
||||
|
||||
postInstall = ''${o.postInstall or ""}
|
||||
postInstall = o.postInstall or "" + ''
|
||||
mkdir -p $out/libexec
|
||||
mv $out/bin/arion $out/libexec
|
||||
makeWrapper $out/libexec/arion $out/bin/arion \
|
||||
|
||||
@@ -412,6 +412,7 @@ remove_tmpPath() {
|
||||
}
|
||||
|
||||
remove_tmpHomePath() {
|
||||
chmod -R u+w "$tmpHomePath"
|
||||
rm -rf "$tmpHomePath"
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,8 @@ curl=(
|
||||
--user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion"
|
||||
)
|
||||
|
||||
if ! [ -f "$SSL_CERT_FILE" ]; then
|
||||
# Default fallback value defined in pkgs/build-support/fetchurl/default.nix
|
||||
if [ "$SSL_CERT_FILE" == "/no-cert-file.crt" ]; then
|
||||
curl+=(--insecure)
|
||||
fi
|
||||
|
||||
|
||||
@@ -220,20 +220,26 @@ stdenvNoCC.mkDerivation (
|
||||
# New-style output content requirements.
|
||||
inherit (hash_) outputHashAlgo outputHash;
|
||||
|
||||
# Disable TLS verification only when we know the hash and no credentials are
|
||||
# needed to access the resource
|
||||
SSL_CERT_FILE =
|
||||
if
|
||||
let
|
||||
nixSSLCertFile = builtins.getEnv "NIX_SSL_CERT_FILE";
|
||||
in
|
||||
if nixSSLCertFile != "" then
|
||||
nixSSLCertFile
|
||||
else if
|
||||
(
|
||||
hash_.outputHash == ""
|
||||
|| hash_.outputHash == lib.fakeSha256
|
||||
|| hash_.outputHash == lib.fakeSha512
|
||||
|| hash_.outputHash == lib.fakeHash
|
||||
# Make sure we always enforce TLS verification when credentials
|
||||
# are needed to access the resource
|
||||
|| netrcPhase != null
|
||||
)
|
||||
then
|
||||
"${cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
else
|
||||
# Fallback to stdenv default, see pkgs/stdenv/generic/setup.sh
|
||||
"/no-cert-file.crt";
|
||||
|
||||
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
|
||||
|
||||
@@ -289,6 +289,7 @@ lib.warnIf (buildFlags != "" || buildFlagsArray != "")
|
||||
"`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead"
|
||||
lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"
|
||||
lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
|
||||
lib.warn '''buildGoPackage' is deprecated and will be removed for the 25.05 release.
|
||||
Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.''
|
||||
lib.warn ''
|
||||
'buildGoPackage' is deprecated and will be removed for the 25.05 release.
|
||||
Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.''
|
||||
package
|
||||
|
||||
@@ -51,9 +51,7 @@ let
|
||||
lib.pipe attrs [
|
||||
(lib.mapAttrsToList renderFunc)
|
||||
(builtins.filter (v: v != ""))
|
||||
(builtins.concatStringsSep "\n")
|
||||
(section: ''${section}
|
||||
'')
|
||||
(lib.concatLines)
|
||||
];
|
||||
|
||||
variablesSectionRendered = renderSomething renderVariable variables;
|
||||
|
||||
@@ -160,7 +160,8 @@ stdenv.mkDerivation (
|
||||
# Build out of source tree and make the source tree read-only. This
|
||||
# helps catch violations of the GNU Coding Standards (info
|
||||
# "(standards) Configuration"), like `make distcheck' does.
|
||||
'' mkdir "../build"
|
||||
''
|
||||
mkdir "../build"
|
||||
cd "../build"
|
||||
configureScript="../$sourceRoot/configure"
|
||||
chmod -R a-w "../$sourceRoot"
|
||||
|
||||
@@ -469,7 +469,11 @@ rec {
|
||||
as a easy way to build multiple derivations at once.
|
||||
*/
|
||||
symlinkJoin =
|
||||
args_@{ name
|
||||
args_@{
|
||||
name ?
|
||||
assert lib.assertMsg (args_ ? pname && args_ ? version)
|
||||
"symlinkJoin requires either a `name` OR `pname` and `version`";
|
||||
"${args_.pname}-${args_.version}"
|
||||
, paths
|
||||
, preferLocalBuild ? true
|
||||
, allowSubstitutes ? false
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.67.3";
|
||||
version = "1.67.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU=";
|
||||
hash = "sha256-zHJE3sau2KAbPNafUw2+OPFI5RRomqzr1QMEB1vfq3I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080=";
|
||||
vendorHash = "sha256-rZn3SYcuFay2pjGad+NhEf8dmzonsvO7M4OQovT8otg=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt5,
|
||||
zsync2,
|
||||
libcpr,
|
||||
libgcrypt,
|
||||
libappimage,
|
||||
argagg,
|
||||
nlohmann_json,
|
||||
gpgme,
|
||||
appimageupdate-qt,
|
||||
withQtUI ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "appimageupdate";
|
||||
version = "2.0.0-alpha-1-20230526";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppImageCommunity";
|
||||
repo = "AppImageUpdate";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \
|
||||
--replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' \
|
||||
--replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \
|
||||
--replace-fail '<local dev build>' '<nixpkgs build>'
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals withQtUI [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
zsync2
|
||||
libcpr
|
||||
libgcrypt
|
||||
libappimage
|
||||
argagg
|
||||
nlohmann_json
|
||||
gpgme
|
||||
]
|
||||
++ lib.optionals withQtUI [
|
||||
qt5.qtbase
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "USE_SYSTEM_ZSYNC2" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_LIBAPPIMAGE" true)
|
||||
(lib.cmakeBool "BUILD_QT_UI" withQtUI)
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = lib.optionalString withQtUI ''
|
||||
wrapQtApp "$out/bin/AppImageUpdate"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit appimageupdate-qt;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Update AppImages using information embedded in the AppImage itself";
|
||||
homepage = "https://github.com/AppImageCommunity/AppImageUpdate";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = if withQtUI then "AppImageUpdate" else "appimageupdatetool";
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "athens";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gomods";
|
||||
repo = "athens";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ikm9nznJhd5ZrkJyh3ny1SZeuWVs5xgT4fpWKhVbuDA=";
|
||||
hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A=";
|
||||
|
||||
@@ -86,9 +86,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm
|
||||
env.NIX_CFLAGS_COMPILE = ''
|
||||
-I${librem}/include/rem -I${gsm}/include/gsm
|
||||
-DHAVE_INTTYPES_H -D__GLIBC__
|
||||
-D__need_timeval -D__need_timespec -D__need_time_t '';
|
||||
-D__need_timeval -D__need_timespec -D__need_time_t
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
# CMake feature detection is prone to breakage between upgrades:
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bundletool";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI=";
|
||||
sha256 = "sha256-LUrZCPrqZAR8HMnLdH5qpmfGqxkuCWB70WtnJGqM1q4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
flex,
|
||||
gitUpdater,
|
||||
libusb1,
|
||||
meson,
|
||||
ninja,
|
||||
pcsclite,
|
||||
perl,
|
||||
pkg-config,
|
||||
@@ -22,14 +24,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace src/Makefile.am --replace-fail /bin/echo echo
|
||||
substituteInPlace meson.build --replace-fail \
|
||||
"pcsc_dep.get_variable('usbdropdir')" \
|
||||
"'$out/pcsc/drivers'"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-twinserial"
|
||||
"--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d"
|
||||
"--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial"
|
||||
"--enable-usbdropdir=${placeholder "out"}/pcsc/drivers"
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "serial" true)
|
||||
];
|
||||
|
||||
# error: call to undeclared function 'InterruptRead';
|
||||
@@ -42,6 +43,8 @@ stdenv.mkDerivation rec {
|
||||
flex
|
||||
perl
|
||||
pkg-config
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -51,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules
|
||||
install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules
|
||||
substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
|
||||
--replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
|
||||
'';
|
||||
@@ -64,6 +67,14 @@ stdenv.mkDerivation rec {
|
||||
url = "https://salsa.debian.org/rousseau/CCID.git";
|
||||
};
|
||||
|
||||
installCheckPhase = ''
|
||||
[ -f $out/etc/reader.conf.d/libccidtwin ]
|
||||
[ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ]
|
||||
[ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ]
|
||||
[ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ]
|
||||
[ -f $out/pcsc/drivers/serial/libccidtwin.so ]
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PC/SC driver for USB CCID smart card readers";
|
||||
homepage = "https://ccid.apdu.fr/";
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "certinfo-go";
|
||||
version = "0.1.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paepckehh";
|
||||
repo = "certinfo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ySXp5dPdGhBEbo9uvCsINCufhm9j/dIX0Jn+Ou73NjM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wrz33FSBz4Kg9aYCj7/Pq07bP73MV9iSQKc3X39OkHc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/paepckehh/certinfo/releases/tag/v${version}";
|
||||
homepage = "https://paepcke.de/certinfo";
|
||||
description = "Tool to analyze and troubleshoot x.509 & ssh certificates, encoded keys, ...";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "certinfo";
|
||||
maintainers = with lib.maintainers; [ paepcke ];
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "charmcraft";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "canonical";
|
||||
repo = "charmcraft";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls=";
|
||||
hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 9ba11f90c4364529f220c44a3266926bf8f6a4b4 Mon Sep 17 00:00:00 2001
|
||||
From: wxt <3264117476@qq.com>
|
||||
Date: Tue, 22 Oct 2024 18:43:20 +0800
|
||||
Subject: [PATCH] fix build
|
||||
|
||||
---
|
||||
Cargo.toml | 1 -
|
||||
crates/proto/build.rs | 1 -
|
||||
crates/proto/src/lib.rs | 1 -
|
||||
3 files changed, 3 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 8deae48..214a0e3 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -122,7 +122,6 @@ clipcat-server = { path = "./crates/server" }
|
||||
|
||||
[workspace.lints.rust]
|
||||
async_fn_in_trait = "allow"
|
||||
-box_pointers = "allow"
|
||||
|
||||
# TODO: deny `unused_crate_dependencies` after https://github.com/rust-lang/rust/issues/95513 being solved
|
||||
unused_crate_dependencies = "allow"
|
||||
diff --git a/crates/proto/build.rs b/crates/proto/build.rs
|
||||
index 5e38f62..d6ba4be 100644
|
||||
--- a/crates/proto/build.rs
|
||||
+++ b/crates/proto/build.rs
|
||||
@@ -6,7 +6,6 @@ fn prost_config() -> Config {
|
||||
config
|
||||
}
|
||||
|
||||
-#[allow(box_pointers)]
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tonic_build::configure().compile_with_config(
|
||||
prost_config(),
|
||||
diff --git a/crates/proto/src/lib.rs b/crates/proto/src/lib.rs
|
||||
index a7205ab..e4dcd02 100644
|
||||
--- a/crates/proto/src/lib.rs
|
||||
+++ b/crates/proto/src/lib.rs
|
||||
@@ -2,7 +2,6 @@ mod utils;
|
||||
mod proto {
|
||||
// SAFETY: allow: prost
|
||||
#![allow(
|
||||
- box_pointers,
|
||||
unreachable_pub,
|
||||
unused_qualifications,
|
||||
unused_results,
|
||||
--
|
||||
2.46.1
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, protobuf
|
||||
, installShellFiles
|
||||
, darwin
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
protobuf,
|
||||
installShellFiles,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -13,8 +14,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrelkd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "clipcat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-95y/HiLmhqt1DFmAxLg/W7lr/9dfVtce4+tx+vG2Nuw=";
|
||||
};
|
||||
|
||||
@@ -28,10 +29,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-fix-build.patch
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# Some test cases interact with X11, skip them
|
||||
"--skip=test_x11_clipboard"
|
||||
@@ -47,12 +51,12 @@ rustPlatform.buildRustPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Clipboard Manager written in Rust Programming Language";
|
||||
homepage = "https://github.com/xrelkd/clipcat";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ xrelkd bot-wxt1221 ];
|
||||
mainProgram = "clipcatd";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cue";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cue-lang";
|
||||
repo = "cue";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GvReoBP8QCdrKxox8yPLZEk5YvTvwr7kflpS/jN8GTg=";
|
||||
hash = "sha256-CwPD+JUoKcs0HqWuZYH2c8AdwK6X0SS3aNGpkcPZ4C4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sLTpra7JwgF4l1UCrUtzQA4xrP4OqxBcZ1qEssBdFtk=";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dpp";
|
||||
version = "10.0.31";
|
||||
version = "10.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainboxdotcc";
|
||||
repo = "DPP";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IsgYGfPcqiJBQ1MM97jI7ksvc49ZcCn3i6/yMe8zLjY=";
|
||||
hash = "sha256-pr7u4x4xdyydEQcNROjfkoV/ODqixugcTuCWMGeixC8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "dune3d";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dune3d";
|
||||
repo = "dune3d";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4=";
|
||||
hash = "sha256-oS10xek4IyRrjZTBvDsjqCA9NE93vzB0W9iQEm2IMf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Generated
+14
@@ -0,0 +1,14 @@
|
||||
# This is automatically generated by the update script.
|
||||
# DO NOT MANUALLY EDIT.
|
||||
{
|
||||
assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k=";
|
||||
edopro-version = "40.1.4";
|
||||
edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b";
|
||||
edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo=";
|
||||
irrlicht-version = "1.9.0-unstable-2023-02-18";
|
||||
irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22";
|
||||
irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA=";
|
||||
ocgcore-version = "0-unstable-2022-09-15";
|
||||
ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4";
|
||||
ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78=";
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Mon, 21 Oct 2024 17:42:24 +0200
|
||||
Subject: [PATCH] Mark Lua symbols as C symbols
|
||||
|
||||
Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols.
|
||||
---
|
||||
interpreter.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/interpreter.h b/interpreter.h
|
||||
index 6c405a1..c471ecb 100644
|
||||
--- a/interpreter.h
|
||||
+++ b/interpreter.h
|
||||
@@ -9,9 +9,11 @@
|
||||
#define INTERPRETER_H_
|
||||
|
||||
// Due to longjmp behaviour, we must build Lua as C++ to avoid UB
|
||||
+extern "C" {
|
||||
#include <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+}
|
||||
|
||||
#include "common.h"
|
||||
#include <unordered_map>
|
||||
--
|
||||
2.44.1
|
||||
|
||||
@@ -0,0 +1,318 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
makeWrapper,
|
||||
premake5,
|
||||
writeShellScriptBin,
|
||||
runCommandLocal,
|
||||
symlinkJoin,
|
||||
imagemagick,
|
||||
bzip2,
|
||||
curl,
|
||||
flac,
|
||||
# Use fmt 10+ after release 40.1.4+
|
||||
fmt_9,
|
||||
freetype,
|
||||
libevent,
|
||||
libgit2,
|
||||
libGL,
|
||||
libGLU,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libvorbis,
|
||||
libX11,
|
||||
libxkbcommon,
|
||||
libXxf86vm,
|
||||
lua5_3,
|
||||
mono,
|
||||
nlohmann_json,
|
||||
openal,
|
||||
SDL2,
|
||||
sqlite,
|
||||
wayland,
|
||||
egl-wayland,
|
||||
covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg",
|
||||
fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png",
|
||||
# While ygoprodeck has higher quality images, "spamming" of their api results in a ban.
|
||||
# Thats why this link can change since it's compiled into the program, However it will
|
||||
# download assets when needed so it is unlikely to get banned. Unless you search the
|
||||
# card list with no filters of any kind. When testing use ProjectIgnis' website instead.
|
||||
pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg",
|
||||
}:
|
||||
let
|
||||
archLabel =
|
||||
{
|
||||
"x86_64-linux" = "x64";
|
||||
"aarch64-linux" = "arm64";
|
||||
}
|
||||
.${stdenv.hostPlatform.system}
|
||||
or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro");
|
||||
|
||||
deps = import ./deps.nix;
|
||||
in
|
||||
let
|
||||
assets = fetchzip {
|
||||
url = "https://github.com/ProjectIgnis/edopro-assets/releases/download/${deps.edopro-version}/ProjectIgnis-EDOPro-${deps.edopro-version}-linux.tar.gz";
|
||||
hash = deps.assets-hash;
|
||||
};
|
||||
|
||||
irrlicht-edopro = stdenv.mkDerivation {
|
||||
pname = "irrlicht-edopro";
|
||||
version = deps.irrlicht-version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edo9300";
|
||||
repo = "irrlicht1-8-4";
|
||||
rev = deps.irrlicht-rev;
|
||||
hash = deps.irrlicht-hash;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libGLU
|
||||
libX11
|
||||
libxkbcommon
|
||||
libXxf86vm
|
||||
wayland
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildFlags = [
|
||||
"NDEBUG=1"
|
||||
];
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"source/Irrlicht"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,include}
|
||||
cp lib/Linux/libIrrlicht.a $out/bin
|
||||
cp -r include/* $out/include
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
ocgcore = stdenv.mkDerivation {
|
||||
pname = "ygopro-core";
|
||||
version = deps.ocgcore-version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edo9300";
|
||||
repo = "ygopro-core";
|
||||
rev = deps.ocgcore-rev;
|
||||
hash = deps.ocgcore-hash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./ocgcore-lua-symbols.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ premake5 ];
|
||||
|
||||
buildInputs = [ lua5_3 ];
|
||||
|
||||
preBuild = ''
|
||||
premake5 gmake2 \
|
||||
--lua-path="${lua5_3}"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildFlags = [
|
||||
"verbose=true"
|
||||
"config=release"
|
||||
"ocgcoreshared"
|
||||
];
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
edopro = stdenv.mkDerivation {
|
||||
pname = "edopro";
|
||||
version = deps.edopro-version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edo9300";
|
||||
repo = "edopro";
|
||||
rev = deps.edopro-rev;
|
||||
hash = deps.edopro-hash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
premake5
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
curl
|
||||
flac
|
||||
fmt_9
|
||||
freetype
|
||||
irrlicht-edopro
|
||||
libevent
|
||||
libgit2
|
||||
libjpeg
|
||||
libpng
|
||||
libvorbis
|
||||
lua5_3
|
||||
nlohmann_json
|
||||
ocgcore
|
||||
openal
|
||||
SDL2
|
||||
sqlite
|
||||
];
|
||||
|
||||
# nixpkgs' gcc stack currently appears to not support LTO
|
||||
postPatch = ''
|
||||
substituteInPlace premake5.lua \
|
||||
--replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
premake5 gmake2 \
|
||||
--architecture=${archLabel} \
|
||||
--covers=\"${covers_url}\" \
|
||||
--fields=\"${fields_url}\" \
|
||||
--pics=\"${pics_url}\" \
|
||||
--prebuilt-core="${lib.getLib ocgcore}/lib" \
|
||||
--sound=sfml
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
env = {
|
||||
# remove after release 40.1.4+
|
||||
# https://discord.com/channels/170601678658076672/792223685112889344/1286043823293599785
|
||||
CXXFLAGS = "-include cstdint";
|
||||
LDFLAGS = "-I ${irrlicht-edopro}/include -L ${irrlicht-edopro}/bin";
|
||||
};
|
||||
buildFlags = [
|
||||
"verbose=true"
|
||||
"config=release_${archLabel}"
|
||||
"ygopro"
|
||||
];
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp bin/${archLabel}/release/ygopro $out/bin
|
||||
wrapProgram $out/bin/ygopro \
|
||||
--prefix PATH : ${lib.makeBinPath [ mono ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
libX11
|
||||
libxkbcommon
|
||||
libXxf86vm
|
||||
sqlite
|
||||
wayland
|
||||
egl-wayland
|
||||
]
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
edopro-script =
|
||||
let
|
||||
assetsToCopy = lib.concatStringsSep "," [
|
||||
# Needed if we download files from ProjectIgnis' website or any https only website.
|
||||
"cacert.pem"
|
||||
"config"
|
||||
"deck"
|
||||
"COPYING.txt"
|
||||
"expansions"
|
||||
"lflists"
|
||||
"notices"
|
||||
"puzzles"
|
||||
"fonts"
|
||||
"script"
|
||||
"skin"
|
||||
"sound"
|
||||
"textures"
|
||||
"WindBot"
|
||||
];
|
||||
in
|
||||
writeShellScriptBin "edopro" ''
|
||||
set -eu
|
||||
EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro"
|
||||
|
||||
if [ ! -d $EDOPRO_DIR ]; then
|
||||
mkdir -p $EDOPRO_DIR
|
||||
cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR
|
||||
chmod -R go-rwx $EDOPRO_DIR
|
||||
|
||||
rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in
|
||||
fi
|
||||
|
||||
exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@
|
||||
'';
|
||||
|
||||
edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } ''
|
||||
cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template
|
||||
|
||||
sed '/Path=/d' -i desktop-template
|
||||
sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template
|
||||
sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template
|
||||
|
||||
install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop
|
||||
'';
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "edopro-application-${deps.edopro-version}";
|
||||
version = deps.edopro-version;
|
||||
paths = [
|
||||
edopro-script
|
||||
edopro-desktop
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps/
|
||||
${imagemagick}/bin/magick \
|
||||
${assets}/textures/AppIcon.png \
|
||||
-resize 256x256 \
|
||||
$out/share/icons/hicolor/256x256/apps/EDOPro.png
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
meta = {
|
||||
description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client";
|
||||
homepage = "https://projectignis.github.io";
|
||||
changelog = "https://github.com/edo9300/edopro/releases";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
OPNA2608
|
||||
redhawk
|
||||
];
|
||||
mainProgram = "edopro";
|
||||
# This is likely a very easy app to port if you're interested.
|
||||
# We just have no way to test on other platforms.
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
Executable
+119
@@ -0,0 +1,119 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit
|
||||
import json
|
||||
import subprocess
|
||||
|
||||
from githubkit import GitHub, UnauthAuthStrategy
|
||||
from githubkit.versions.latest.models import (
|
||||
Commit,
|
||||
ContentSubmodule,
|
||||
Tag,
|
||||
)
|
||||
|
||||
DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix"
|
||||
|
||||
with GitHub(UnauthAuthStrategy()) as github:
|
||||
edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0]
|
||||
|
||||
ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content(
|
||||
"edo9300", "edopro", "ocgcore"
|
||||
).parsed_data
|
||||
|
||||
ocgcore: Commit = github.rest.repos.get_commit(
|
||||
"edo9300", "ygopro-core", ocgcore_submodule.sha
|
||||
).parsed_data
|
||||
|
||||
# This dep is not versioned in anyway and is why we check below to see if this is a new version.
|
||||
irrlicht: Commit = github.rest.repos.list_commits(
|
||||
"edo9300", "irrlicht1-8-4"
|
||||
).parsed_data[0]
|
||||
|
||||
irrlicht: Commit = github.rest.repos.get_commit(
|
||||
"edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22"
|
||||
).parsed_data
|
||||
|
||||
|
||||
edopro_working_version: str = ""
|
||||
try:
|
||||
with open(DEPS_PATH, "r") as file:
|
||||
for line in file.readlines():
|
||||
if "edopro-version" in line:
|
||||
edopro_working_version = line.split('"')[1]
|
||||
except FileNotFoundError:
|
||||
print("Error: Dep file not found.")
|
||||
exit(2)
|
||||
|
||||
if edopro_working_version == "":
|
||||
print("Working version is unbound")
|
||||
exit(5)
|
||||
|
||||
if edopro_working_version == edopro.name:
|
||||
print("Version is updated")
|
||||
exit(0)
|
||||
|
||||
|
||||
def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str:
|
||||
args: list[str] = ["nix-prefetch-github", owner, repo, "--rev", rev]
|
||||
|
||||
if submodule:
|
||||
args.append("--fetch-submodules")
|
||||
|
||||
out: subprocess.CompletedProcess = subprocess.run(args, capture_output=True)
|
||||
out_json = json.loads(out.stdout.decode())
|
||||
|
||||
return out_json["hash"]
|
||||
|
||||
|
||||
edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True)
|
||||
ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha)
|
||||
irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha)
|
||||
|
||||
asset_legacy_hash: str = (
|
||||
subprocess.run(
|
||||
[
|
||||
"nix-prefetch-url",
|
||||
f"https://github.com/ProjectIgnis/edopro-assets/releases/download/{edopro.name}/ProjectIgnis-EDOPro-{edopro.name}-linux.tar.gz",
|
||||
"--unpack",
|
||||
],
|
||||
capture_output=True,
|
||||
)
|
||||
.stdout.decode()
|
||||
.strip()
|
||||
)
|
||||
asset_hash: str = (
|
||||
subprocess.run(
|
||||
[
|
||||
"nix",
|
||||
"--extra-experimental-features",
|
||||
"nix-command",
|
||||
"hash",
|
||||
"to-sri",
|
||||
"--type",
|
||||
"sha256",
|
||||
asset_legacy_hash,
|
||||
],
|
||||
capture_output=True,
|
||||
)
|
||||
.stdout.decode()
|
||||
.strip()
|
||||
)
|
||||
|
||||
|
||||
with open(DEPS_PATH, "w") as file:
|
||||
contents = f"""# This is automatically generated by the update script.
|
||||
# DO NOT MANUALLY EDIT.
|
||||
{{
|
||||
assets-hash = "{asset_hash}";
|
||||
edopro-version = "{edopro.name}";
|
||||
edopro-rev = "{edopro.commit.sha}";
|
||||
edopro-hash = "{edopro_hash}";
|
||||
irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}";
|
||||
irrlicht-rev = "{irrlicht.sha}";
|
||||
irrlicht-hash = "{irrlicht_hash}";
|
||||
ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}";
|
||||
ocgcore-rev = "{ocgcore.sha}";
|
||||
ocgcore-hash = "{ocgcore_hash}";
|
||||
}}
|
||||
"""
|
||||
|
||||
file.write(contents)
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# override this to false if you don't want to build python3
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
# prevent the `install-data-local` Makefile rule from running;
|
||||
# all it does is attempt to `mkdir` the `localstatedir`.
|
||||
|
||||
@@ -2,6 +2,17 @@
|
||||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.10.tar.xz"
|
||||
],
|
||||
"name": "factorio_alpha_x64-2.0.10.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "07508fc5112f95ef5d5afedea66863ea326e039bd872b772b934ed08545c399b",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.10/alpha/linux64",
|
||||
"version": "2.0.10"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.9.tar.xz"
|
||||
],
|
||||
@@ -11,17 +22,6 @@
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.9/alpha/linux64",
|
||||
"version": "2.0.9"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.8.tar.xz"
|
||||
],
|
||||
"name": "factorio_alpha_x64-2.0.8.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "94ea36a5b9103369df7158a8281039dd2f1d7fa7bb3a2d854c715250dd73e185",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.8/alpha/linux64",
|
||||
"version": "2.0.8"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
@@ -50,6 +50,17 @@
|
||||
},
|
||||
"expansion": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.10.tar.xz"
|
||||
],
|
||||
"name": "factorio_expansion_x64-2.0.10.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "f7d346578c812314be8b72fbf6fd291c53d23ecc2dc6556a8948d26b3b95d71e",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.10/expansion/linux64",
|
||||
"version": "2.0.10"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.9.tar.xz"
|
||||
],
|
||||
@@ -59,21 +70,22 @@
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.9/expansion/linux64",
|
||||
"version": "2.0.9"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.8.tar.xz"
|
||||
],
|
||||
"name": "factorio_expansion_x64-2.0.8.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "408eae824daa761564b1ea7b81925efe05298cbaffd120eea235341ac05a6a60",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.8/expansion/linux64",
|
||||
"version": "2.0.8"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.10.tar.xz",
|
||||
"factorio_headless_x64_2.0.10.tar.xz"
|
||||
],
|
||||
"name": "factorio_headless_x64-2.0.10.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "2d7dd212fa6f715218a5e33bad7d593af8998fa7bf7ce727343159ee1f8c23f4",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.10/headless/linux64",
|
||||
"version": "2.0.10"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.9.tar.xz",
|
||||
"factorio_headless_x64_2.0.9.tar.xz"
|
||||
@@ -84,18 +96,6 @@
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.9/headless/linux64",
|
||||
"version": "2.0.9"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.8.tar.xz",
|
||||
"factorio_headless_x64_2.0.8.tar.xz"
|
||||
],
|
||||
"name": "factorio_headless_x64-2.0.8.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.8/headless/linux64",
|
||||
"version": "2.0.8"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fanbox-dl";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hareku";
|
||||
repo = "fanbox-dl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EO1J90uH2J8EI51qGzIQyl4BbSwijkEi5ZQENgSMEm8=";
|
||||
hash = "sha256-JARIY6z912XDvZ6JviLMP8OZLOIzUPLuJtWGpKcqwvY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U=";
|
||||
vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA=";
|
||||
|
||||
# pings websites during testing
|
||||
doCheck = false;
|
||||
|
||||
@@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.27.1";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-N/C6vGNebOFQ5RRpHD2hTqvHbX5mwICqIeFsdSCjaR4=";
|
||||
hash = "sha256-fkAtBO9POd3JKNNt0jV1ufIN1s8HaFW7P2+32cRycWs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folio";
|
||||
version = "24.11";
|
||||
version = "24.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toolstack";
|
||||
repo = "Folio";
|
||||
rev = version;
|
||||
hash = "sha256-55zNxZbta12T/N6ruzY+/FVlinVMYcE02C48nTQUeO4=";
|
||||
hash = "sha256-0Aq8R+5k5LCmciRHauTvxuJWCyN3FN4sP9aEPNlMn+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,7 +28,7 @@ buildGo123Module rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
make manpage
|
||||
installManPage share/man/man1/*
|
||||
installShellCompletion --cmd glab \
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.23.0";
|
||||
version = "0.25.0";
|
||||
gitSrc = fetchFromGitHub {
|
||||
owner = "glasskube";
|
||||
repo = "glasskube";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X9XXQ/Ke3toXLIkSCzGrypd1lKDfslpJ96zmDHBDbl8=";
|
||||
hash = "sha256-456kMO7KappYI2FuHA8g+uhkJNCGCxb/9zmleZqu6SQ=";
|
||||
};
|
||||
web-bundle = buildNpmPackage rec {
|
||||
inherit version;
|
||||
@@ -21,7 +21,7 @@ let
|
||||
|
||||
src = gitSrc;
|
||||
|
||||
npmDepsHash = "sha256-9BicZfnrJEFrtaJ0uGmLnnY99KplnL8qdmG5FMo70uI=";
|
||||
npmDepsHash = "sha256-XKPFT8eyZmDhNbuCpTzGYeg5QdhgpVhHkj8AGSlh6WU=";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
@@ -41,7 +41,7 @@ in buildGo123Module rec {
|
||||
|
||||
src = gitSrc;
|
||||
|
||||
vendorHash = "sha256-xpN/5VmRPFQegP+ORpb875N/+AKgxiqyZWk4Px+SCZ4=";
|
||||
vendorHash = "sha256-oly6SLgXVyvKQQuPrb76LYngoDPNLjTAs4gWCT3/kew=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user