Merge staging-next into staging
This commit is contained in:
commit
31817540ee
@ -695,9 +695,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||
The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform.
|
||||
|
||||
- `services.btrbk` now automatically selects and provides required compression
|
||||
program depending on the configured `stream_compress` option. Since this
|
||||
replaces the need for the `extraPackages` option, this option will be
|
||||
deprecated in future releases.
|
||||
program depending on the configured `stream_compress` option.
|
||||
|
||||
- `services.github-runner` module has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration.
|
||||
|
||||
|
@ -30,6 +30,8 @@
|
||||
|
||||
- [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable).
|
||||
|
||||
- [Localsend](https://localsend.org/), an open source cross-platform alternative to AirDrop. Available as [programs.localsend](#opt-programs.localsend.enable).
|
||||
|
||||
- [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable).
|
||||
|
||||
- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld).
|
||||
|
@ -226,6 +226,7 @@
|
||||
./programs/less.nix
|
||||
./programs/liboping.nix
|
||||
./programs/light.nix
|
||||
./programs/localsend.nix
|
||||
./programs/mdevctl.nix
|
||||
./programs/mepo.nix
|
||||
./programs/mininet.nix
|
||||
|
26
nixos/modules/programs/localsend.nix
Normal file
26
nixos/modules/programs/localsend.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.programs.localsend;
|
||||
firewallPort = 53317;
|
||||
in
|
||||
{
|
||||
options.programs.localsend = {
|
||||
enable = lib.mkEnableOption "localsend, an open source cross-platform alternative to AirDrop";
|
||||
|
||||
openFirewall = lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" // {
|
||||
default = true;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.localsend ];
|
||||
networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ pandapip1 ];
|
||||
}
|
@ -204,10 +204,6 @@ in
|
||||
};
|
||||
config = mkIf (sshEnabled || serviceEnabled) {
|
||||
|
||||
warnings = optional (cfg.extraPackages != []) ''
|
||||
extraPackages option will be deprecated in future releases. Programs required for compression are now automatically selected depending on services.btrbk.instances.<name>.settings.stream_compress option.
|
||||
'';
|
||||
|
||||
environment.systemPackages = [ pkgs.btrbk ] ++ cfg.extraPackages;
|
||||
|
||||
security.sudo.extraRules = mkIf (sudo_doas == "sudo") [ sudoRule ];
|
||||
|
@ -39,6 +39,7 @@ in {
|
||||
qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
|
||||
suru-icon-theme
|
||||
telephony-service
|
||||
teleports
|
||||
]);
|
||||
variables = {
|
||||
# To override the keyboard layouts in Lomiri
|
||||
|
@ -81,6 +81,33 @@ in
|
||||
Only log messages with the given severity or above.
|
||||
'';
|
||||
};
|
||||
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/root/prometheus-snmp-exporter.env";
|
||||
description = ''
|
||||
EnvironmentFile as defined in {manpage}`systemd.exec(5)`.
|
||||
|
||||
Secrets may be passed to the service without adding them to the
|
||||
world-readable Nix store, by specifying placeholder variables as
|
||||
the option value in Nix and setting these variables accordingly in the
|
||||
environment file.
|
||||
|
||||
Environment variables from this file will be interpolated into the
|
||||
config file using envsubst with this syntax:
|
||||
`$ENVIRONMENT ''${VARIABLE}`
|
||||
|
||||
For variables to use see [Prometheus Configuration](https://github.com/prometheus/snmp_exporter#prometheus-configuration).
|
||||
|
||||
If the file path is set to this option, the parameter
|
||||
`--config.expand-environment-variables` is implicitly added to
|
||||
`ExecStart`.
|
||||
|
||||
Note that this file needs to be available on the host on which
|
||||
this exporter is running.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = let
|
||||
uncheckedConfigFile = if cfg.configurationPath != null
|
||||
@ -92,9 +119,12 @@ in
|
||||
uncheckedConfigFile;
|
||||
in {
|
||||
serviceConfig = {
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \
|
||||
--config.file=${escapeShellArg configFile} \
|
||||
${lib.optionalString (cfg.environmentFile != null)
|
||||
"--config.expand-environment-variables"} \
|
||||
--log.format=${escapeShellArg cfg.logFormat} \
|
||||
--log.level=${cfg.logLevel} \
|
||||
--web.listen-address=${cfg.listenAddress}:${toString cfg.port} \
|
||||
|
@ -62,11 +62,11 @@ in
|
||||
keyfile = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
Name of a file containing the spiped key. As the
|
||||
daemon runs as the `spiped` user, the
|
||||
key file must be somewhere owned by that user. By
|
||||
default, we recommend putting the keys for any spipe
|
||||
services in `/var/lib/spiped`.
|
||||
Name of a file containing the spiped key.
|
||||
As the daemon runs as the `spiped` user,
|
||||
the key file must be readable by that user.
|
||||
To securely manage the file within your configuration
|
||||
consider a tool such as agenix or sops-nix.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -185,22 +185,12 @@ in
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
User = "spiped";
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
|
||||
preStart = ''
|
||||
cd /var/lib/spiped
|
||||
chmod -R 0660 *
|
||||
chown -R spiped:spiped *
|
||||
'';
|
||||
scriptArgs = "%i";
|
||||
script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`";
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = lib.mkIf (cfg.config != { }) [
|
||||
"d /var/lib/spiped -"
|
||||
];
|
||||
|
||||
# Setup spiped config files
|
||||
environment.etc = mapAttrs' (name: cfg: nameValuePair "spiped/${name}.spec"
|
||||
{ text = concatStringsSep " "
|
||||
|
@ -516,6 +516,7 @@ in {
|
||||
listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix {};
|
||||
litestream = handleTest ./litestream.nix {};
|
||||
lldap = handleTest ./lldap.nix {};
|
||||
localsend = handleTest ./localsend.nix {};
|
||||
locate = handleTest ./locate.nix {};
|
||||
login = handleTest ./login.nix {};
|
||||
logrotate = handleTest ./logrotate.nix {};
|
||||
@ -975,6 +976,7 @@ in {
|
||||
teeworlds = handleTest ./teeworlds.nix {};
|
||||
telegraf = handleTest ./telegraf.nix {};
|
||||
teleport = handleTest ./teleport.nix {};
|
||||
teleports = runTest ./teleports.nix;
|
||||
thelounge = handleTest ./thelounge.nix {};
|
||||
terminal-emulators = handleTest ./terminal-emulators.nix {};
|
||||
thanos = handleTest ./thanos.nix {};
|
||||
|
21
nixos/tests/localsend.nix
Normal file
21
nixos/tests/localsend.nix
Normal file
@ -0,0 +1,21 @@
|
||||
import ./make-test-python.nix (
|
||||
{ ... }:
|
||||
{
|
||||
name = "localsend";
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
imports = [ ./common/x11.nix ];
|
||||
programs.localsend.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_x()
|
||||
machine.succeed("localsend_app >&2 &")
|
||||
machine.wait_for_open_port(53317)
|
||||
machine.wait_for_window("LocalSend", 10)
|
||||
machine.succeed("netstat --listening --program --tcp | grep -P 'tcp.*53317.*localsend'")
|
||||
'';
|
||||
}
|
||||
)
|
48
nixos/tests/teleports.nix
Normal file
48
nixos/tests/teleports.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "teleports-standalone";
|
||||
meta.maintainers = lib.teams.lomiri.members;
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [ ./common/x11.nix ];
|
||||
|
||||
services.xserver.enable = true;
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs.lomiri; [
|
||||
suru-icon-theme
|
||||
teleports
|
||||
];
|
||||
variables = {
|
||||
UITK_ICON_THEME = "suru";
|
||||
};
|
||||
};
|
||||
|
||||
i18n.supportedLocales = [ "all" ];
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
# Intended font & helps with OCR
|
||||
ubuntu_font_family
|
||||
];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("teleports launches"):
|
||||
machine.execute("teleports >&2 &")
|
||||
machine.wait_for_text(r"(TELEports|Phone Number)")
|
||||
machine.screenshot("teleports_open")
|
||||
|
||||
machine.succeed("pkill -f teleports")
|
||||
|
||||
with subtest("teleports localisation works"):
|
||||
machine.execute("env LANG=de_DE.UTF-8 teleports >&2 &")
|
||||
machine.wait_for_text("Telefonnummer")
|
||||
machine.screenshot("teleports_localised")
|
||||
'';
|
||||
}
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
|
||||
hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "mobian1";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU=";
|
||||
hash = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "jpcima";
|
||||
repo = "DelayArchitect";
|
||||
rev = "5abf4dfb7f92ba604d591a2c388d2d69a9055fe3";
|
||||
sha256 = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo=";
|
||||
hash = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "dexed";
|
||||
rev = "2c036316bcd512818aa9cc8129767ad9e0ec7132";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g=";
|
||||
hash = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "michaelwillis";
|
||||
repo = "dragonfly-reverb";
|
||||
rev = version;
|
||||
sha256 = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY=";
|
||||
hash = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -29,7 +29,7 @@ let
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
rev = version;
|
||||
sha256 = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw=";
|
||||
hash = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "Fire";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE=";
|
||||
hash = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Geonkick-Synthesizer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0=";
|
||||
hash = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "brummer10";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag=";
|
||||
hash = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4=";
|
||||
hash = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "jacktrip";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94=";
|
||||
hash = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo=";
|
||||
hash = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "master_me";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE=";
|
||||
hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -21,7 +21,7 @@ mkDerivation rec {
|
||||
owner = "ColinDuquesnoy";
|
||||
repo = "MellowPlayer";
|
||||
rev = version;
|
||||
sha256 = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
|
||||
hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
@ -9,7 +9,7 @@ buildGoModule rec {
|
||||
repo = "NoiseTorch";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
|
||||
hash = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "odin2";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY=";
|
||||
hash = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -28,7 +28,7 @@ mkDerivation rec {
|
||||
owner = "luciocarreras";
|
||||
repo = "sayonara-player";
|
||||
rev = version;
|
||||
sha256 = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw=";
|
||||
hash = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config qttools ];
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "sfztools";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI=";
|
||||
hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -20,7 +20,7 @@ mkDerivation rec {
|
||||
owner = "agateau";
|
||||
repo = "sfxr-qt";
|
||||
rev = version;
|
||||
sha256 = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg=";
|
||||
hash = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "surge-synthesizer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg=";
|
||||
hash = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "surge";
|
||||
rev = "release_xt_${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw=";
|
||||
hash = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "uade-music-player";
|
||||
repo = "uade";
|
||||
rev = "uade-${version}";
|
||||
sha256 = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw=";
|
||||
hash = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "zamaudio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y=";
|
||||
hash = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg=";
|
||||
hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
repo = "aeon";
|
||||
rev = "v${version}-aeon";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-2MptLS12CUm9eUKm+V+yYpbLVwNyZeZ5HvAFyjEc4R4=";
|
||||
hash = "sha256-2MptLS12CUm9eUKm+V+yYpbLVwNyZeZ5HvAFyjEc4R4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ];
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "bitcoinunlimited";
|
||||
repo = "BCHUnlimited";
|
||||
rev = "BCHunlimited${version}";
|
||||
sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg=";
|
||||
hash = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook python3 ]
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "haven-protocol-org";
|
||||
repo = "haven-main";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI=";
|
||||
hash = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
repo = "LibreSprite";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY=";
|
||||
hash = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY=";
|
||||
};
|
||||
|
||||
# Backport GCC 13 build fix
|
||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "Marker";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
|
||||
hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@ mkDerivation rec {
|
||||
owner = "dail8859";
|
||||
repo = "NotepadNext";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU=";
|
||||
hash = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU=";
|
||||
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "shiiion";
|
||||
repo = "dolphin";
|
||||
rev = version;
|
||||
sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
|
||||
hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU=";
|
||||
hash = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "mr_goldberg";
|
||||
repo = "goldberg_emulator";
|
||||
rev = version;
|
||||
sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
|
||||
hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
|
||||
};
|
||||
|
||||
# It attempts to install windows-only libraries which we never build
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "openMSX";
|
||||
repo = "openMSX";
|
||||
rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
|
||||
sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc=";
|
||||
hash = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -18,7 +18,7 @@ mkDerivation rec {
|
||||
# latest revision is not tagged upstream, use commit sha in the meantime
|
||||
#rev = "v_${version}";
|
||||
rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce";
|
||||
sha256 = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM=";
|
||||
hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "Foxotron";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw=";
|
||||
hash = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.50.0";
|
||||
version = "1.51.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lyBXMctEL8Z6rscsSDHh7xLhjvnpN2q4qMVV2ek9Cyk=";
|
||||
hash = "sha256-b4RyAA32qQHbnX7AC0w64BM+y5uZCeZgd9SKQdJaJWc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -27,7 +27,7 @@ mkDerivation rec {
|
||||
owner = "stuko";
|
||||
repo = "ovito";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA=";
|
||||
hash = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
repo = "pizarra-gtk";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw=";
|
||||
hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU=";
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs=";
|
||||
hash = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapGAppsHook3 ];
|
||||
|
@ -7,7 +7,7 @@ mkDerivation rec {
|
||||
owner = "pholy";
|
||||
repo = "OSCAR-code";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg=";
|
||||
hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qttools qtserialport libGLU ];
|
||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "albertlauncher";
|
||||
repo = "albert";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM=";
|
||||
hash = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -12,7 +12,7 @@ mkDerivation rec {
|
||||
owner = "debauchee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
|
||||
hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec{
|
||||
owner = "corectrl";
|
||||
repo = "corectrl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw=";
|
||||
hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw=";
|
||||
};
|
||||
patches = [
|
||||
./polkit-dir.patch
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Cubitect";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo=";
|
||||
hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
owner = "WhyNotHugo";
|
||||
repo = "darkman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o=";
|
||||
hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -13,7 +13,7 @@ mkDerivation rec {
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
|
||||
hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ];
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
owner = "fetchmail";
|
||||
repo = "fetchmail";
|
||||
rev = "30b368fb8660d8fec08be1cdf2606c160b4bcb80";
|
||||
sha256 = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8=";
|
||||
hash = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8=";
|
||||
};
|
||||
|
||||
buildInputs = with pkgs; [ openssl python3 ];
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Kerenoc";
|
||||
repo = "GCstar";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg=";
|
||||
hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
|
@ -1,9 +1,5 @@
|
||||
{ lib, stdenv, requireFile, bc, version, src, eulaDate }:
|
||||
|
||||
let
|
||||
license_dir = "~/.config/houdini";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
{ stdenv, bc, version, src, eulaDate }:
|
||||
stdenv.mkDerivation {
|
||||
inherit version src;
|
||||
pname = "houdini-runtime";
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ lib, requireFile, callPackage}:
|
||||
{ requireFile, callPackage }:
|
||||
|
||||
callPackage ./runtime-build.nix rec {
|
||||
version = "20.0.688";
|
||||
version = "20.5.278";
|
||||
eulaDate = "2021-10-13";
|
||||
src = requireFile rec {
|
||||
src = requireFile {
|
||||
name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz";
|
||||
sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6";
|
||||
hash = "sha256-O5oAoiDiu+xrmDfTnilPqZue8+dXVTHnK0yrX6moTSc=";
|
||||
url = "https://www.sidefx.com/download/daily-builds/?production=true";
|
||||
};
|
||||
}
|
||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "sonnyp";
|
||||
repo = "junction";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI=";
|
||||
hash = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "snakedye";
|
||||
repo = "kile";
|
||||
rev = "c24208761d04e0a74d203fc1dcd2f7fed68da388";
|
||||
sha256 = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs=";
|
||||
hash = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "makeself";
|
||||
rev = "release-${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g=";
|
||||
hash = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "meganz";
|
||||
repo = "MEGAcmd";
|
||||
rev = "${version}_Linux";
|
||||
sha256 = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
|
||||
hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -33,7 +33,7 @@ mkDerivation rec {
|
||||
owner = "meganz";
|
||||
repo = "MEGAsync";
|
||||
rev = "v${version}_Linux";
|
||||
sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY=";
|
||||
hash = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "moonlight-stream";
|
||||
repo = "moonlight-embedded";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg=";
|
||||
hash = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "CalcProgrammer1";
|
||||
repo = "OpenRGB";
|
||||
rev = "release_${version}";
|
||||
sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
|
||||
hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ=";
|
||||
hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hasherezade";
|
||||
repo = "pe-bear";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE=";
|
||||
hash = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -14,7 +14,7 @@ let
|
||||
"src/slic3r/GUI/Tab.cpp"
|
||||
"src/slic3r/Utils/Http.cpp"
|
||||
];
|
||||
sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c=";
|
||||
hash = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c=";
|
||||
})
|
||||
./meshboolean-const.patch
|
||||
];
|
||||
@ -22,28 +22,28 @@ let
|
||||
versions = {
|
||||
stable = {
|
||||
version = "2.3.57.12";
|
||||
sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw==";
|
||||
hash = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw==";
|
||||
patches = null;
|
||||
};
|
||||
latest = {
|
||||
version = "2.4.58.5";
|
||||
sha256 = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0=";
|
||||
hash = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0=";
|
||||
inherit patches;
|
||||
};
|
||||
beta = {
|
||||
version = "2.5.59.6";
|
||||
sha256 = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c=";
|
||||
hash = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c=";
|
||||
inherit patches;
|
||||
};
|
||||
};
|
||||
|
||||
override = { version, sha256, patches }: super: {
|
||||
override = { version, hash, patches }: super: {
|
||||
inherit version pname patches;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supermerill";
|
||||
repo = "SuperSlicer";
|
||||
inherit sha256;
|
||||
inherit hash;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
@ -132,7 +132,7 @@ rec {
|
||||
owner = "chinstrap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
|
||||
hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
|
||||
};
|
||||
|
||||
meta = redshift.meta // {
|
||||
|
@ -38,7 +38,7 @@ mkDerivation rec {
|
||||
repo = "RedisDesktopManager";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
|
||||
hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "marvinkreis";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw=";
|
||||
hash = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4=";
|
||||
hash = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -15,7 +15,7 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
|
||||
repo = "rofi";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8=";
|
||||
hash = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
|
||||
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "symless";
|
||||
repo = "synergy-core";
|
||||
rev = version;
|
||||
sha256 = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY=";
|
||||
hash = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskwarrior";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw=";
|
||||
hash = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "timewarrior";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ=";
|
||||
hash = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "tipp10";
|
||||
repo = "tipp10";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4=";
|
||||
hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
||||
|
@ -7,7 +7,7 @@ buildGoModule rec {
|
||||
src = fetchgit {
|
||||
url = "https://tildegit.org/sloum/bombadillo.git";
|
||||
rev = version;
|
||||
sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
|
||||
hash = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jx";
|
||||
version = "3.10.152";
|
||||
version = "3.10.154";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenkins-x";
|
||||
repo = "jx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rOpKaVn2D5UMYaVXLRxvwTRzo+nD1H/95FcQSeFgeFo=";
|
||||
sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14=";
|
||||
|
@ -8,7 +8,7 @@ buildGoModule rec {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oOz7Dt+j2EmBL/aJUjqRST90wYpXkyREnKCcmNBQX18=";
|
||||
hash = "sha256-oOz7Dt+j2EmBL/aJUjqRST90wYpXkyREnKCcmNBQX18=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "caveman250";
|
||||
repo = "Headlines";
|
||||
rev = version;
|
||||
sha256 = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k=";
|
||||
hash = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Chatterino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE=";
|
||||
hash = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ];
|
||||
|
@ -1,88 +1,89 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, pkg-config
|
||||
, fetchFromGitLab
|
||||
, gitUpdater
|
||||
, ffmpeg_6
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
pkg-config,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
ffmpeg_6,
|
||||
|
||||
# for daemon
|
||||
, autoreconfHook
|
||||
, perl # for pod2man
|
||||
, alsa-lib
|
||||
, asio
|
||||
, dbus
|
||||
, sdbus-cpp
|
||||
, fmt
|
||||
, gmp
|
||||
, gnutls
|
||||
, http-parser
|
||||
, jack
|
||||
, jsoncpp
|
||||
, libarchive
|
||||
, libgit2
|
||||
, libnatpmp
|
||||
, libpulseaudio
|
||||
, libupnp
|
||||
, yaml-cpp
|
||||
, msgpack-cxx
|
||||
, openssl
|
||||
, restinio
|
||||
, secp256k1
|
||||
, speex
|
||||
, udev
|
||||
, webrtc-audio-processing
|
||||
, zlib
|
||||
autoreconfHook,
|
||||
perl, # for pod2man
|
||||
alsa-lib,
|
||||
asio,
|
||||
dbus,
|
||||
sdbus-cpp,
|
||||
fmt,
|
||||
gmp,
|
||||
gnutls,
|
||||
llhttp,
|
||||
jack,
|
||||
jsoncpp,
|
||||
libarchive,
|
||||
libgit2,
|
||||
libnatpmp,
|
||||
libpulseaudio,
|
||||
libupnp,
|
||||
yaml-cpp,
|
||||
msgpack-cxx,
|
||||
openssl,
|
||||
restinio,
|
||||
secp256k1,
|
||||
speex,
|
||||
udev,
|
||||
webrtc-audio-processing,
|
||||
zlib,
|
||||
|
||||
# for client
|
||||
, cmake
|
||||
, git
|
||||
, networkmanager # for libnm
|
||||
, python3
|
||||
, qttools # for translations
|
||||
, wrapQtAppsHook
|
||||
, libnotify
|
||||
, qt5compat
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qrencode
|
||||
, qtmultimedia
|
||||
, qtnetworkauth
|
||||
, qtpositioning
|
||||
, qtsvg
|
||||
, qtwebengine
|
||||
, qtwebchannel
|
||||
, wrapGAppsHook3
|
||||
, withWebengine ? true
|
||||
cmake,
|
||||
git,
|
||||
networkmanager, # for libnm
|
||||
python3,
|
||||
qttools, # for translations
|
||||
wrapQtAppsHook,
|
||||
libnotify,
|
||||
qt5compat,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qrencode,
|
||||
qtmultimedia,
|
||||
qtnetworkauth,
|
||||
qtpositioning,
|
||||
qtsvg,
|
||||
qtwebengine,
|
||||
qtwebchannel,
|
||||
wrapGAppsHook3,
|
||||
withWebengine ? true,
|
||||
|
||||
# for pjsip
|
||||
, fetchFromGitHub
|
||||
, pjsip
|
||||
fetchFromGitHub,
|
||||
pjsip,
|
||||
|
||||
# for opendht
|
||||
, opendht
|
||||
opendht,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jami";
|
||||
version = "20240529.0";
|
||||
version = "20240627.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.jami.net";
|
||||
owner = "savoirfairelinux";
|
||||
repo = "jami-client-qt";
|
||||
rev = "stable/${version}";
|
||||
hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U=";
|
||||
hash = "sha256-aePF1c99ju9y7JEgC+F2BPfpSAZlLd5OI5Jm6i9VlQQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
pjsip-jami = pjsip.overrideAttrs (old: rec {
|
||||
version = "797f1a38cc1066acc4adc9561aa1288afabe72d5";
|
||||
version = "8fc165b833eea6e3c88d67a541385424b129fd3f";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "pjproject";
|
||||
rev = version;
|
||||
hash = "sha256-lTDbJF09R2G+EIkMj1YyKa4XokH9LlcIG+RhRJhzUes=";
|
||||
hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@ -106,25 +107,24 @@ stdenv.mkDerivation rec {
|
||||
"--disable-resample"
|
||||
"--disable-libwebrtc"
|
||||
"--with-gnutls=yes"
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
"--enable-epoll"
|
||||
];
|
||||
] ++ lib.optionals stdenv.isLinux [ "--enable-epoll" ];
|
||||
|
||||
buildInputs = old.buildInputs ++ [ gnutls ];
|
||||
});
|
||||
|
||||
opendht-jami = (opendht.overrideAttrs {
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "opendht";
|
||||
rev = "f2cee8e9ce24746caa7dee1847829c526d340284";
|
||||
hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA=";
|
||||
};
|
||||
}).override {
|
||||
enableProxyServerAndClient = true;
|
||||
enablePushNotifications = true;
|
||||
};
|
||||
opendht-jami =
|
||||
(opendht.overrideAttrs {
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "opendht";
|
||||
rev = "074e05cc3254d5d73b0d96ee772a6e01bb3113e5";
|
||||
hash = "sha256-WuaURlC7eDDxvnM3YuyU9CNrwnE4WBQUIEw3z/0zjN8=";
|
||||
};
|
||||
}).override
|
||||
{
|
||||
enableProxyServerAndClient = true;
|
||||
enablePushNotifications = true;
|
||||
};
|
||||
|
||||
dhtnet = stdenv.mkDerivation {
|
||||
pname = "dhtnet";
|
||||
@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
|
||||
asio
|
||||
fmt
|
||||
gnutls
|
||||
http-parser
|
||||
llhttp
|
||||
jsoncpp
|
||||
libupnp
|
||||
msgpack-cxx
|
||||
@ -194,7 +194,7 @@ stdenv.mkDerivation rec {
|
||||
ffmpeg_6
|
||||
gmp
|
||||
gnutls
|
||||
http-parser
|
||||
llhttp
|
||||
jack
|
||||
jsoncpp
|
||||
libarchive
|
||||
@ -265,13 +265,9 @@ stdenv.mkDerivation rec {
|
||||
qtpositioning
|
||||
qtsvg
|
||||
qtwebchannel
|
||||
] ++ lib.optionals withWebengine [
|
||||
qtwebengine
|
||||
];
|
||||
] ++ lib.optionals withWebengine [ qtwebengine ];
|
||||
|
||||
cmakeFlags = lib.optionals (!withWebengine) [
|
||||
"-DWITH_WEBENGINE=false"
|
||||
];
|
||||
cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
# With wayland the titlebar is not themed and the wmclass is wrong.
|
||||
@ -282,9 +278,7 @@ stdenv.mkDerivation rec {
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "stable/";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "stable/"; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://jami.net/";
|
||||
|
@ -7,7 +7,7 @@ buildGoModule {
|
||||
src = fetchgit {
|
||||
url = "https://git.lost.host/meutraa/mm.git";
|
||||
rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c";
|
||||
sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk=";
|
||||
hash = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM=";
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "gkdr";
|
||||
repo = "lurch";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g=";
|
||||
hash = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "hoehermann";
|
||||
repo = "libpurple-signald";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc=";
|
||||
hash = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -13,7 +13,7 @@ let
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA=";
|
||||
hash = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA=";
|
||||
};
|
||||
|
||||
gradleWithJdk = gradle.override { java = jdk17_headless; };
|
||||
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "kotatogram";
|
||||
repo = "kotatogram-desktop";
|
||||
rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2";
|
||||
sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0=";
|
||||
hash = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -19,7 +19,7 @@ mkDerivation rec {
|
||||
owner = "davidar";
|
||||
repo = "tensor";
|
||||
rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
|
||||
sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY=";
|
||||
hash = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "uTox";
|
||||
repo = "uTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc=";
|
||||
hash = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ircdog";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goshuirc";
|
||||
repo = "ircdog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TdMgt1ZgoEaweH8Cbb+wG/H1Bx9DpgHgzGO5dZfxvK8=";
|
||||
hash = "sha256-X8DTwudgQyQQIpXCG7d+tdXMV33HG6ETzHsvIp3KFDo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "obgm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I=";
|
||||
hash = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
|
@ -4,6 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, flutter313
|
||||
, makeDesktopItem
|
||||
, nixosTests
|
||||
, pkg-config
|
||||
, libayatana-appindicator
|
||||
, undmg
|
||||
@ -58,7 +59,10 @@ let
|
||||
categories = [ "Network" ];
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
tests.localsend = nixosTests.localsend;
|
||||
};
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "localsend_app";
|
||||
@ -94,7 +98,7 @@ let
|
||||
homepage = "https://localsend.org/";
|
||||
license = licenses.mit;
|
||||
mainProgram = "localsend";
|
||||
maintainers = with maintainers; [ sikmir linsui ];
|
||||
maintainers = with maintainers; [ sikmir linsui pandapip1 ];
|
||||
};
|
||||
in
|
||||
if stdenv.isDarwin
|
||||
|
@ -104,7 +104,7 @@ let
|
||||
owner = "mumble-voip";
|
||||
repo = "mumble";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4=";
|
||||
hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "bitseater";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hubKusrs0Hh8RryoEI29pnhTSNsIbtGMltlH4qoM6gE=";
|
||||
hash = "sha256-hubKusrs0Hh8RryoEI29pnhTSNsIbtGMltlH4qoM6gE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "gridtracker.org";
|
||||
repo = "gridtracker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU=";
|
||||
hash = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user