mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d5bca87877
259 changed files with 9433 additions and 1021 deletions
11
.github/CODEOWNERS
vendored
11
.github/CODEOWNERS
vendored
|
|
@ -53,7 +53,7 @@
|
|||
/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
|
||||
/pkgs/pkgs-lib @infinisil
|
||||
## Format generators/serializers
|
||||
/pkgs/pkgs-lib/formats/libconfig @ckiee @h7x4
|
||||
/pkgs/pkgs-lib/formats/libconfig @h7x4
|
||||
/pkgs/pkgs-lib/formats/hocon @h7x4
|
||||
|
||||
# pkgs/by-name
|
||||
|
|
@ -225,18 +225,15 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
|||
/nixos/modules/services/networking/ntp @thoughtpolice
|
||||
|
||||
# Network
|
||||
/pkgs/tools/networking/octodns @Janik-Haag
|
||||
/pkgs/tools/networking/kea/default.nix @mweinelt
|
||||
/pkgs/tools/networking/babeld/default.nix @mweinelt
|
||||
/nixos/modules/services/networking/babeld.nix @mweinelt
|
||||
/nixos/modules/services/networking/kea.nix @mweinelt
|
||||
/nixos/modules/services/networking/knot.nix @mweinelt
|
||||
nixos/modules/services/networking/networkmanager.nix @Janik-Haag
|
||||
/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt
|
||||
/nixos/tests/babeld.nix @mweinelt
|
||||
/nixos/tests/kea.nix @mweinelt
|
||||
/nixos/tests/knot.nix @mweinelt
|
||||
/nixos/tests/networking/* @Janik-Haag
|
||||
|
||||
# Web servers
|
||||
/doc/packages/nginx.section.md @raitobezarius
|
||||
|
|
@ -322,9 +319,9 @@ pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange
|
|||
/doc/languages-frameworks/dotnet.section.md @corngood
|
||||
|
||||
# Node.js
|
||||
/pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt
|
||||
/pkgs/build-support/node/fetch-npm-deps @lilyinstarlight @winterqt
|
||||
/doc/languages-frameworks/javascript.section.md @lilyinstarlight @winterqt
|
||||
/pkgs/build-support/node/build-npm-package @winterqt
|
||||
/pkgs/build-support/node/fetch-npm-deps @winterqt
|
||||
/doc/languages-frameworks/javascript.section.md @winterqt
|
||||
|
||||
# environment.noXlibs option aka NoX
|
||||
/nixos/modules/config/no-x-libs.nix @SuperSandro2000
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@ let
|
|||
|
||||
outer_types =
|
||||
rec {
|
||||
__attrsFailEvaluation = true;
|
||||
isType = type: x: (x._type or "") == type;
|
||||
|
||||
setType = typeName: value: value // {
|
||||
|
|
|
|||
|
|
@ -3713,14 +3713,6 @@
|
|||
githubId = 1448923;
|
||||
name = "Christian Kauhaus";
|
||||
};
|
||||
ckie = {
|
||||
email = "nixpkgs-0efe364@ckie.dev";
|
||||
github = "ckiee";
|
||||
githubId = 25263210;
|
||||
keys = [ { fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; } ];
|
||||
name = "ckie";
|
||||
matrix = "@ckie:ckie.dev";
|
||||
};
|
||||
cko = {
|
||||
email = "christine.koppelt@gmail.com";
|
||||
github = "cko";
|
||||
|
|
@ -8963,13 +8955,6 @@
|
|||
githubId = 1358764;
|
||||
name = "Jamie Magee";
|
||||
};
|
||||
janik = {
|
||||
name = "Janik";
|
||||
email = "janik@aq0.de";
|
||||
matrix = "@janik0:matrix.org";
|
||||
github = "Janik-Haag";
|
||||
githubId = 80165193;
|
||||
};
|
||||
jankaifer = {
|
||||
name = "Jan Kaifer";
|
||||
email = "jan@kaifer.cz";
|
||||
|
|
@ -10158,12 +10143,6 @@
|
|||
githubId = 46386452;
|
||||
name = "Jeroen Wijenbergh";
|
||||
};
|
||||
jwoudenberg = {
|
||||
email = "nixpkgs@jasperwoudenberg.com";
|
||||
github = "jwoudenberg";
|
||||
githubId = 1525551;
|
||||
name = "Jasper Woudenberg";
|
||||
};
|
||||
jwygoda = {
|
||||
email = "jaroslaw@wygoda.me";
|
||||
github = "jwygoda";
|
||||
|
|
@ -11347,12 +11326,6 @@
|
|||
githubId = 13804737;
|
||||
keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ];
|
||||
};
|
||||
lf- = {
|
||||
email = "nix-maint@lfcode.ca";
|
||||
github = "lf-";
|
||||
githubId = 6652840;
|
||||
name = "Jade";
|
||||
};
|
||||
lgcl = {
|
||||
email = "dev@lgcl.de";
|
||||
name = "Leon Vack";
|
||||
|
|
@ -11461,13 +11434,6 @@
|
|||
githubId = 714;
|
||||
name = "Lily Ballard";
|
||||
};
|
||||
lilyinstarlight = {
|
||||
email = "lily@lily.flowers";
|
||||
matrix = "@lily:lily.flowers";
|
||||
github = "lilyinstarlight";
|
||||
githubId = 298109;
|
||||
name = "Lily Foster";
|
||||
};
|
||||
limeytexan = {
|
||||
email = "limeytexan@gmail.com";
|
||||
github = "limeytexan";
|
||||
|
|
@ -15341,12 +15307,6 @@
|
|||
githubId = 4580157;
|
||||
name = "Patrick Hobusch";
|
||||
};
|
||||
patka = {
|
||||
email = "patka@patka.dev";
|
||||
github = "patka-123";
|
||||
githubId = 69802930;
|
||||
name = "patka";
|
||||
};
|
||||
patrickdag = {
|
||||
email = "patrick-nixos@failmail.dev";
|
||||
github = "PatrickDaG";
|
||||
|
|
@ -15519,12 +15479,6 @@
|
|||
githubId = 13225611;
|
||||
name = "Nicolas Martin";
|
||||
};
|
||||
pennae = {
|
||||
name = "pennae";
|
||||
email = "github@quasiparticle.net";
|
||||
github = "pennae";
|
||||
githubId = 82953136;
|
||||
};
|
||||
perchun = {
|
||||
name = "Perchun Pak";
|
||||
email = "nixpkgs@perchun.it";
|
||||
|
|
@ -17356,12 +17310,6 @@
|
|||
github = "roshaen";
|
||||
githubId = 58213083;
|
||||
};
|
||||
rossabaker = {
|
||||
name = "Ross A. Baker";
|
||||
email = "ross@rossabaker.com";
|
||||
github = "rossabaker";
|
||||
githubId = 142698;
|
||||
};
|
||||
RossComputerGuy = {
|
||||
name = "Tristan Ross";
|
||||
email = "tristan.ross@midstall.com";
|
||||
|
|
|
|||
|
|
@ -715,10 +715,7 @@ with lib.maintainers;
|
|||
};
|
||||
|
||||
node = {
|
||||
members = [
|
||||
lilyinstarlight
|
||||
winter
|
||||
];
|
||||
members = [ winter ];
|
||||
scope = "Maintain Node.js runtimes and build tooling.";
|
||||
shortName = "Node.js";
|
||||
enableFeatureFreezePing = true;
|
||||
|
|
@ -772,7 +769,6 @@ with lib.maintainers;
|
|||
aanderse
|
||||
drupol
|
||||
ma27
|
||||
patka
|
||||
talyz
|
||||
];
|
||||
githubTeams = [ "php" ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
let
|
||||
cfg = config.programs.qdmr;
|
||||
in {
|
||||
meta.maintainers = [ lib.maintainers.janik ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
options = {
|
||||
programs.qdmr = {
|
||||
|
|
|
|||
|
|
@ -104,6 +104,9 @@ let
|
|||
--what="sleep" \
|
||||
--why="Scheduled backup" \
|
||||
'' + backupScript;
|
||||
unitConfig = optionalAttrs (isLocalPath cfg.repo) {
|
||||
RequiresMountsFor = [ cfg.repo ];
|
||||
};
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ janik ambroisie ];
|
||||
meta.maintainers = with lib.maintainers; [ ambroisie ];
|
||||
|
||||
options = {
|
||||
services.woodpecker-agents = {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
cfg = config.services.woodpecker-server;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ janik ambroisie ];
|
||||
meta.maintainers = with lib.maintainers; [ ambroisie ];
|
||||
|
||||
|
||||
options = {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
toml = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
meta.maintainers = with maintainers; [ ckie ];
|
||||
meta.maintainers = with maintainers; [ ];
|
||||
|
||||
options.services.rkvm = {
|
||||
enable = mkOption {
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ let
|
|||
`cloudflared` starts a proxy server to translate HTTP traffic into TCP when proxying, for example, SSH or RDP. This configures what type of proxy will be started. Valid options are:
|
||||
|
||||
- `""` for the regular proxy
|
||||
- `"socks"` for a SOCKS5 proxy. Refer to the [https://developers.cloudflare.com/cloudflare-one/tutorials/kubectl/](tutorial on connecting through Cloudflare Access using kubectl) for more information.
|
||||
- `"socks"` for a SOCKS5 proxy. Refer to the [tutorial on connecting through Cloudflare Access using kubectl](https://developers.cloudflare.com/cloudflare-one/tutorials/kubectl/) for more information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -167,7 +167,7 @@ in
|
|||
description = ''
|
||||
Credential file.
|
||||
|
||||
See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#credentials-file](Credentials file).
|
||||
See [Credentials file](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/tunnel-useful-terms/#credentials-file).
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -178,7 +178,7 @@ in
|
|||
description = ''
|
||||
Enable warp routing.
|
||||
|
||||
See [https://developers.cloudflare.com/cloudflare-one/tutorials/warp-to-tunnel/](Connect from WARP to a private network on Cloudflare using Cloudflare Tunnel).
|
||||
See [Connect from WARP to a private network on Cloudflare using Cloudflare Tunnel](https://developers.cloudflare.com/cloudflare-one/tutorials/warp-to-tunnel/).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -204,7 +204,7 @@ in
|
|||
description = ''
|
||||
Service to pass the traffic.
|
||||
|
||||
See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#supported-protocols](Supported protocols).
|
||||
See [Supported protocols](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/#supported-protocols).
|
||||
'';
|
||||
example = "http://localhost:80, tcp://localhost:8000, unix:/home/production/echo.sock, hello_world or http_status:404";
|
||||
};
|
||||
|
|
@ -226,7 +226,7 @@ in
|
|||
description = ''
|
||||
Ingress rules.
|
||||
|
||||
See [https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/](Ingress rules).
|
||||
See [Ingress rules](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/configuration/local-management/ingress/).
|
||||
'';
|
||||
example = {
|
||||
"*.domain.com" = "http://localhost:80";
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ in
|
|||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ pennae ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
doc = ./firefox-syncserver.md;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -721,7 +721,7 @@ in
|
|||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ pennae ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
doc = ./mosquitto.md;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ in {
|
|||
|
||||
enable = mkEnableOption ''
|
||||
Networkd-dispatcher service for systemd-networkd connection status
|
||||
change. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions)
|
||||
change. See [upstream instructions](https://gitlab.com/craftyguy/networkd-dispatcher)
|
||||
for usage
|
||||
'';
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ in {
|
|||
'';
|
||||
description = ''
|
||||
Declarative configuration of networkd-dispatcher rules. See
|
||||
[https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions)
|
||||
[upstream instructions](https://gitlab.com/craftyguy/networkd-dispatcher)
|
||||
for an introduction and example scripts.
|
||||
'';
|
||||
type = types.attrsOf (types.submodule {
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ in
|
|||
{
|
||||
|
||||
meta = {
|
||||
maintainers = teams.freedesktop.members ++ [ lib.maintainers.janik ];
|
||||
maintainers = teams.freedesktop.members;
|
||||
};
|
||||
|
||||
###### interface
|
||||
|
|
|
|||
|
|
@ -291,5 +291,5 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ jwoudenberg ];
|
||||
meta.maintainers = with maintainers; [ ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ in
|
|||
{
|
||||
###### interface
|
||||
|
||||
meta.maintainers = with maintainers; [ philandstuff rawkode jwoudenberg ];
|
||||
meta.maintainers = with maintainers; [ philandstuff rawkode ];
|
||||
|
||||
options = {
|
||||
|
||||
|
|
|
|||
|
|
@ -121,6 +121,29 @@ Auto updates for Nextcloud apps can be enabled using
|
|||
This is not an end-to-end encryption, but can be used to encrypt files that will be persisted
|
||||
to external storage such as S3.
|
||||
|
||||
- **Issues with file permissions / unsafe path transitions**
|
||||
|
||||
{manpage}`systemd-tmpfiles(8)` makes sure that the paths for
|
||||
|
||||
* configuration (including declarative config)
|
||||
* data
|
||||
* app store
|
||||
* home directory itself (usually `/var/lib/nextcloud`)
|
||||
|
||||
are properly set up. However, `systemd-tmpfiles` will refuse to do so
|
||||
if it detects an unsafe path transition, i.e. creating files/directories
|
||||
within a directory that is neither owned by `root` nor by `nextcloud`, the
|
||||
owning user of the files/directories to be created.
|
||||
|
||||
Symptoms of that include
|
||||
|
||||
* `config/override.config.php` not being updated (and the config file
|
||||
eventually being garbage-collected).
|
||||
* failure to read from application data.
|
||||
|
||||
To work around that, please make sure that all directories in question
|
||||
are owned by `nextcloud:nextcloud`.
|
||||
|
||||
## Using an alternative webserver as reverse-proxy (e.g. `httpd`) {#module-services-nextcloud-httpd}
|
||||
|
||||
By default, `nginx` is used as reverse-proxy for `nextcloud`.
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ let
|
|||
keepFile = "important_file";
|
||||
keepFileData = "important_data";
|
||||
localRepo = "/root/back:up";
|
||||
# a repository on a file system which is not mounted automatically
|
||||
localRepoMount = "/noAutoMount";
|
||||
archiveName = "my_archive";
|
||||
remoteRepo = "borg@server:."; # No need to specify path
|
||||
privateKey = pkgs.writeText "id_ed25519" ''
|
||||
|
|
@ -42,6 +44,12 @@ in {
|
|||
|
||||
nodes = {
|
||||
client = { ... }: {
|
||||
virtualisation.fileSystems.${localRepoMount} = {
|
||||
device = "tmpfs";
|
||||
fsType = "tmpfs";
|
||||
options = [ "noauto" ];
|
||||
};
|
||||
|
||||
services.borgbackup.jobs = {
|
||||
|
||||
local = {
|
||||
|
|
@ -65,6 +73,13 @@ in {
|
|||
startAt = [ ]; # Do not run automatically
|
||||
};
|
||||
|
||||
localMount = {
|
||||
paths = dataDir;
|
||||
repo = localRepoMount;
|
||||
encryption.mode = "none";
|
||||
startAt = [ ];
|
||||
};
|
||||
|
||||
remote = {
|
||||
paths = dataDir;
|
||||
repo = remoteRepo;
|
||||
|
|
@ -178,6 +193,17 @@ in {
|
|||
"cat /mnt/borg/${dataDir}/${keepFile}"
|
||||
)
|
||||
|
||||
with subtest("localMount"):
|
||||
# the file system for the repo should not be already mounted
|
||||
client.fail("mount | grep ${localRepoMount}")
|
||||
# ensure trying to write to the mountpoint before the fs is mounted fails
|
||||
client.succeed("chattr +i ${localRepoMount}")
|
||||
borg = "borg"
|
||||
client.systemctl("start --wait borgbackup-job-localMount")
|
||||
client.fail("systemctl is-failed borgbackup-job-localMount")
|
||||
# Make sure exactly one archive has been created
|
||||
assert int(client.succeed("{} list '${localRepoMount}' | wc -l".format(borg))) > 0
|
||||
|
||||
with subtest("remote"):
|
||||
borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg"
|
||||
server.wait_for_unit("sshd.service")
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ in {
|
|||
name = "curl-impersonate";
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ lilyinstarlight ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "frp";
|
||||
meta.maintainers = with lib.maintainers; [ zaldnoay janik ];
|
||||
meta.maintainers = with lib.maintainers; [ zaldnoay ];
|
||||
nodes = {
|
||||
frps = {
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ let
|
|||
in {
|
||||
name = "mosquitto";
|
||||
meta = with pkgs.lib; {
|
||||
maintainers = with maintainers; [ pennae peterhoeg ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
|
||||
nodes = let
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ let
|
|||
in lib.mapAttrs (lib.const (attrs: makeTest (attrs // {
|
||||
name = "${attrs.name}-Networking-NetworkManager";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ janik ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
}))) testCases
|
||||
|
|
|
|||
|
|
@ -67,6 +67,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.asl20;
|
||||
# currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/phijor/mopidy-notify";
|
||||
description = "Mopidy extension for showing desktop notifications on track change";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,6 @@ pythonPackages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/mopidy/mopidy-spotify";
|
||||
description = "Mopidy extension for playing music from Spotify";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ buildNpmPackage rec {
|
|||
description = "Libre and modular OSC / MIDI controller";
|
||||
homepage = "https://openstagecontrol.ammd.net/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "open-stage-control";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ buildDotnetModule rec {
|
|||
# worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT
|
||||
unfreeRedistributable
|
||||
];
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
mainProgram = "OpenUtau";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://sonic-pi.net/";
|
||||
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ];
|
||||
maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Next generation modular control surface";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ lilyinstarlight ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ];
|
||||
mainProgram = "TouchOSC";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "CLI tool to check the integrity of a restic repository without unlocking it";
|
||||
homepage = "https://git.nwex.de/networkException/restic-integrity";
|
||||
license = with licenses; [ bsd2 ];
|
||||
maintainers = with maintainers; [ janik ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "restic-integrity";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Simple text editor forked from Leafpad using GTK+ 3.x";
|
||||
homepage = "https://github.com/stevenhoneyman/l3afpad";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2;
|
||||
mainProgram = "l3afpad";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Real-time GPU shader editor";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ prusnak lilyinstarlight ];
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ];
|
||||
mainProgram = "KodeLife";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightburn";
|
||||
version = "1.6.00";
|
||||
version = "1.6.03";
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
|
||||
sha256 = "sha256-R9DBlmqvV23QXzC45Z4GN0t+ysv4WM63POJGU5N7jbw=";
|
||||
sha256 = "sha256-yMxCe9Bu5llAUrTLG8R+1HX65rs9fhhoVG79vxDzeWY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mob";
|
||||
version = "4.5.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uFtE7AprM/ye2sBQeszYy07RV7RmmqD9TGcTTuZwOfY=";
|
||||
sha256 = "sha256-1A8xoDiDBW1YieRDTCAiena63j4y7FJf5dMQoNrIAno=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
|
||||
changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ];
|
||||
maintainers = with maintainers; [ vrthra fpletz ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "mupdf";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "pass_secret_service";
|
||||
maintainers = with lib.maintainers; [ jluttine aidalgol ];
|
||||
maintainers = with lib.maintainers; [ jluttine ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
|||
if stdenv.isAarch64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.67.116";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.67.116/brave-browser_1.67.116_arm64.deb";
|
||||
hash = "sha256-YOvfXI+bSX3WZRBYXxGYhNme9NZl3ob/JYw6KshXn54=";
|
||||
version = "1.67.123";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_arm64.deb";
|
||||
hash = "sha256-YcTwa1sTKpLn9O4/M11nrjgItD6ktug1GFw0tNcZplg=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.67.116";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.67.116/brave-browser_1.67.116_amd64.deb";
|
||||
hash = "sha256-J4ap0bEAg5Q40U155AdAyzereBAo8Q/YDedDVqYvaT4=";
|
||||
version = "1.67.123";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_amd64.deb";
|
||||
hash = "sha256-L9Jcug6HQxJ4E2C9p8BdwxkD75F2j+HaEmgjdrU9oEo=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aiac";
|
||||
version = "4.3.0";
|
||||
version = "5.0.0";
|
||||
excludedPackages = [".ci"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gofireflyio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6u/TVCLFtcNzmchYw8dhedNRm7Lpl9oi8MpYkLYzFdg=";
|
||||
hash = "sha256-4XjtzfICFCy2mA0FK0yV/hI5PPVpgXt5LlJTAxQAVq8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ=";
|
||||
vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE=";
|
||||
ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ buildGoModule rec {
|
|||
mainProgram = "neosay";
|
||||
homepage = "https://github.com/donuts-are-good/neosay";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ janik ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "teams-for-linux";
|
||||
homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ];
|
||||
maintainers = with lib.maintainers; [ muscaln qjoly chvp ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,17 +6,18 @@
|
|||
, cmake
|
||||
, ninja
|
||||
, clang
|
||||
, lld
|
||||
, python3
|
||||
, wrapQtAppsHook
|
||||
, removeReferencesTo
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, qtimageformats
|
||||
, qtsvg
|
||||
, kwayland
|
||||
, qtwayland
|
||||
, kcoreaddons
|
||||
, lz4
|
||||
, xxHash
|
||||
, ffmpeg_4
|
||||
, ffmpeg
|
||||
, openalSoft
|
||||
, minizip
|
||||
, libopus
|
||||
|
|
@ -25,94 +26,59 @@
|
|||
, range-v3
|
||||
, tl-expected
|
||||
, hunspell
|
||||
, glibmm
|
||||
, gobject-introspection
|
||||
, glibmm_2_68
|
||||
, jemalloc
|
||||
, rnnoise
|
||||
, abseil-cpp
|
||||
, microsoft-gsl
|
||||
, boost
|
||||
, fmt
|
||||
, wayland
|
||||
, libicns
|
||||
, Cocoa
|
||||
, CoreFoundation
|
||||
, CoreServices
|
||||
, CoreText
|
||||
, CoreGraphics
|
||||
, CoreMedia
|
||||
, OpenGL
|
||||
, AudioUnit
|
||||
, ApplicationServices
|
||||
, Foundation
|
||||
, AGL
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, Carbon
|
||||
, AudioToolbox
|
||||
, VideoToolbox
|
||||
, VideoDecodeAcceleration
|
||||
, AVFoundation
|
||||
, CoreAudio
|
||||
, CoreVideo
|
||||
, CoreMediaIO
|
||||
, QuartzCore
|
||||
, AppKit
|
||||
, CoreWLAN
|
||||
, WebKit
|
||||
, IOKit
|
||||
, GSS
|
||||
, MediaPlayer
|
||||
, IOSurface
|
||||
, Metal
|
||||
, MetalKit
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
tg_owt = callPackage ./tg_owt.nix {
|
||||
abseil-cpp = abseil-cpp.override {
|
||||
# abseil-cpp should use the same compiler
|
||||
inherit stdenv;
|
||||
cxxStandard = "20";
|
||||
};
|
||||
|
||||
# tg_owt should use the same compiler
|
||||
inherit stdenv;
|
||||
|
||||
inherit Cocoa AppKit IOKit IOSurface Foundation AVFoundation CoreMedia VideoToolbox
|
||||
CoreGraphics CoreVideo OpenGL Metal MetalKit CoreFoundation ApplicationServices;
|
||||
};
|
||||
|
||||
mainProgram = if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotatogram-desktop";
|
||||
version = "1.4.9";
|
||||
version = "0-unstable-2024-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kotatogram";
|
||||
repo = "kotatogram-desktop";
|
||||
rev = "k${version}";
|
||||
sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw=";
|
||||
rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2";
|
||||
sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./kf594.patch
|
||||
./shortcuts-binary-path.patch
|
||||
./macos.patch
|
||||
./macos-opengl.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
|
||||
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
|
||||
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
|
||||
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
|
||||
--replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
sed -i "13i#import <CoreAudio/CoreAudio.h>" Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm
|
||||
substituteInPlace Telegram/CMakeLists.txt \
|
||||
--replace 'COMMAND iconutil' 'COMMAND png2icns' \
|
||||
--replace '--convert icns' "" \
|
||||
--replace '--output AppIcon.icns' 'AppIcon.icns' \
|
||||
--replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png"
|
||||
substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \
|
||||
--replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
|
||||
'';
|
||||
|
||||
# Wrapping the inside of the app bundles, avoiding double-wrapping
|
||||
dontWrapQtApps = stdenv.isDarwin;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
|
|
@ -123,7 +89,9 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isLinux [
|
||||
# to build bundled libdispatch
|
||||
clang
|
||||
extra-cmake-modules
|
||||
gobject-introspection
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
lld
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -132,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
qtsvg
|
||||
lz4
|
||||
xxHash
|
||||
ffmpeg_4
|
||||
ffmpeg
|
||||
openalSoft
|
||||
minizip
|
||||
libopus
|
||||
|
|
@ -141,15 +109,18 @@ stdenv.mkDerivation rec {
|
|||
rnnoise
|
||||
tg_owt
|
||||
microsoft-gsl
|
||||
boost
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
kwayland
|
||||
qtwayland
|
||||
kcoreaddons
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
hunspell
|
||||
glibmm
|
||||
glibmm_2_68
|
||||
jemalloc
|
||||
fmt
|
||||
wayland
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
Cocoa
|
||||
CoreFoundation
|
||||
CoreServices
|
||||
|
|
@ -180,27 +151,34 @@ stdenv.mkDerivation rec {
|
|||
MediaPlayer
|
||||
IOSurface
|
||||
Metal
|
||||
NaturalLanguage
|
||||
libicns
|
||||
];
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env = lib.optionalAttrs stdenv.isDarwin {
|
||||
NIX_CFLAGS_LINK = "-fuse-ld=lld";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DTDESKTOP_API_TEST=ON"
|
||||
"-DDESKTOP_APP_QT6=OFF"
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r Kotatogram.app $out/Applications
|
||||
ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin
|
||||
cp -r ${mainProgram}.app $out/Applications
|
||||
ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"}
|
||||
remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName
|
||||
remove-references-to -t ${microsoft-gsl} $out/bin/$binName
|
||||
remove-references-to -t ${tg_owt.dev} $out/bin/$binName
|
||||
remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram}
|
||||
remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram}
|
||||
remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
@ -208,8 +186,8 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
inherit mainProgram;
|
||||
description = "Kotatogram – experimental Telegram Desktop fork";
|
||||
mainProgram = "kotatogram-desktop";
|
||||
longDescription = ''
|
||||
Unofficial desktop client for the Telegram messenger, based on Telegram Desktop.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
index 7641579aa..3c195e397 100644
|
||||
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
|
||||
#include "base/platform/base_platform_info.h"
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
-#include <surface.h>
|
||||
-#include <plasmashell.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
+#include <KWayland/Client/surface.h>
|
||||
+#include <KWayland/Client/plasmashell.h>
|
||||
|
||||
using namespace KWayland::Client;
|
||||
|
||||
Submodule Telegram/lib_base contains modified content
|
||||
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
index 32f0de6..30a087f 100644
|
||||
--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtGui/QWindow>
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
-#include <surface.h>
|
||||
-#include <xdgforeign.h>
|
||||
-#include <idleinhibit.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
+#include <KWayland/Client/surface.h>
|
||||
+#include <KWayland/Client/xdgforeign.h>
|
||||
+#include <KWayland/Client/idleinhibit.h>
|
||||
|
||||
using namespace KWayland::Client;
|
||||
|
||||
Submodule Telegram/lib_ui contains modified content
|
||||
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
index 01f1e80..163cb6a 100644
|
||||
--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <private/qwaylandwindow_p.h>
|
||||
#include <private/qwaylandshellsurface_p.h>
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
|
||||
Q_DECLARE_METATYPE(QMargins);
|
||||
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
|
||||
index 655e7cf410..c356acbffe 100644
|
||||
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
|
||||
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
|
||||
@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() {
|
||||
Ui::GL::ChosenRenderer Pip::chooseRenderer(
|
||||
Ui::GL::Capabilities capabilities) {
|
||||
const auto use = Platform::IsMac()
|
||||
- ? true
|
||||
+ ? false
|
||||
: capabilities.transparency;
|
||||
LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use)));
|
||||
if (use) {
|
||||
Submodule Telegram/lib_ui contains modified content
|
||||
diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp
|
||||
index 150eb8b..c7ce9f9 100644
|
||||
--- a/Telegram/lib_ui/ui/gl/gl_detection.cpp
|
||||
+++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp
|
||||
@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) {
|
||||
|
||||
Backend ChooseBackendDefault(Capabilities capabilities) {
|
||||
const auto use = ::Platform::IsMac()
|
||||
- ? true
|
||||
+ ? false
|
||||
: ::Platform::IsWindows()
|
||||
? capabilities.supported
|
||||
: capabilities.transparency;
|
||||
diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm
|
||||
index 7b29363..22c4fb3 100644
|
||||
--- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm
|
||||
+++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm
|
||||
@@ -16,7 +16,6 @@
|
||||
#include <QtCore/QAbstractNativeEventFilter>
|
||||
#include <QtGui/QWindow>
|
||||
#include <QtGui/QtEvents>
|
||||
-#include <QOpenGLWidget>
|
||||
#include <Cocoa/Cocoa.h>
|
||||
|
||||
@interface WindowObserver : NSObject {
|
||||
@@ -138,7 +137,6 @@ public:
|
||||
|
||||
private:
|
||||
void init();
|
||||
- void initOpenGL();
|
||||
void resolveWeakPointers();
|
||||
void revalidateWeakPointers() const;
|
||||
void initCustomTitle();
|
||||
@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() {
|
||||
}
|
||||
}
|
||||
|
||||
-void WindowHelper::Private::initOpenGL() {
|
||||
- auto forceOpenGL = std::make_unique<QOpenGLWidget>(_owner->window());
|
||||
-}
|
||||
-
|
||||
void WindowHelper::Private::resolveWeakPointers() {
|
||||
if (!_owner->window()->winId()) {
|
||||
_owner->window()->createWinId();
|
||||
@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() {
|
||||
}
|
||||
|
||||
void WindowHelper::Private::init() {
|
||||
- initOpenGL();
|
||||
resolveWeakPointers();
|
||||
initCustomTitle();
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
Submodule Telegram/lib_base contains modified content
|
||||
diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
|
||||
index 7ce90d3..dac3c2c 100644
|
||||
--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
|
||||
+++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm
|
||||
@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
|
||||
_observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)];
|
||||
|
||||
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
|
||||
+#if 0
|
||||
if (@available(macOS 12.0, *)) {
|
||||
[center
|
||||
addObserver: _observer
|
||||
@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) {
|
||||
name: NSProcessInfoPowerStateDidChangeNotification
|
||||
object: nil];
|
||||
}
|
||||
+#endif
|
||||
[center
|
||||
addObserver: _observer
|
||||
selector: @selector(powerStateChanged:)
|
||||
@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const {
|
||||
return std::nullopt;
|
||||
}
|
||||
NSProcessInfo *info = [NSProcessInfo processInfo];
|
||||
+#if 0
|
||||
if (@available(macOS 12.0, *)) {
|
||||
if ([info isLowPowerModeEnabled]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
const auto state = DetectBatteryState();
|
||||
if (!state.has || !state.draining) {
|
||||
return false;
|
||||
Submodule Telegram/lib_webview contains modified content
|
||||
diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
index 657c5a4..4bfc097 100644
|
||||
--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
+++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm
|
||||
@@ -317,9 +317,11 @@ Instance::Instance(Config config) {
|
||||
_dataRequestHandler = std::move(config.dataRequestHandler);
|
||||
[configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)];
|
||||
_webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration];
|
||||
+#if 0
|
||||
if (@available(macOS 13.3, *)) {
|
||||
_webview.inspectable = config.debug ? YES : NO;
|
||||
}
|
||||
+#endif
|
||||
[_manager addScriptMessageHandler:_handler name:@"external"];
|
||||
[_webview setNavigationDelegate:_handler];
|
||||
[_webview setUIDelegate:_handler];
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
|
||||
index 2a092c6ea..de46dd269 100644
|
||||
--- a/Telegram/SourceFiles/core/application.cpp
|
||||
+++ b/Telegram/SourceFiles/core/application.cpp
|
||||
@@ -1173,7 +1173,7 @@ void Application::startShortcuts() {
|
||||
|
||||
void Application::RegisterUrlScheme() {
|
||||
base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{
|
||||
- .executable = cExeDir() + cExeName(),
|
||||
+ .executable = qsl("kotatogram-desktop"),
|
||||
.arguments = qsl("-workdir \"%1\"").arg(cWorkingDir()),
|
||||
.protocol = qsl("tg"),
|
||||
.protocolName = qsl("Telegram Link"),
|
||||
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
|
||||
index 26168baa7..00d2525a0 100644
|
||||
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
|
||||
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
|
||||
@@ -303,19 +303,11 @@ bool GenerateDesktopFile(
|
||||
|
||||
QFile target(targetFile);
|
||||
if (target.open(QIODevice::WriteOnly)) {
|
||||
- fileText = fileText.replace(
|
||||
- QRegularExpression(
|
||||
- qsl("^TryExec=.*$"),
|
||||
- QRegularExpression::MultilineOption),
|
||||
- qsl("TryExec=%1").arg(
|
||||
- QString(cExeDir() + cExeName()).replace('\\', "\\\\")));
|
||||
-
|
||||
fileText = fileText.replace(
|
||||
QRegularExpression(
|
||||
qsl("^Exec=kotatogram-desktop(.*)$"),
|
||||
QRegularExpression::MultilineOption),
|
||||
- qsl("Exec=%1 -workdir %2\\1").arg(
|
||||
- EscapeShellInLauncher(cExeDir() + cExeName()),
|
||||
+ qsl("Exec=kotatogram-desktop -workdir %1\\1").arg(
|
||||
EscapeShellInLauncher(cWorkingDir())));
|
||||
|
||||
fileText = fileText.replace(
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, cmake
|
||||
, ninja
|
||||
|
|
@ -9,10 +8,10 @@
|
|||
, libjpeg
|
||||
, openssl
|
||||
, libopus
|
||||
, ffmpeg_4
|
||||
, ffmpeg
|
||||
, protobuf
|
||||
, openh264
|
||||
, usrsctp
|
||||
, crc32c
|
||||
, libvpx
|
||||
, libX11
|
||||
, libXtst
|
||||
|
|
@ -28,65 +27,23 @@
|
|||
, mesa
|
||||
, libdrm
|
||||
, libGL
|
||||
, Cocoa
|
||||
, AppKit
|
||||
, IOKit
|
||||
, IOSurface
|
||||
, Foundation
|
||||
, AVFoundation
|
||||
, CoreMedia
|
||||
, VideoToolbox
|
||||
, CoreGraphics
|
||||
, CoreVideo
|
||||
, OpenGL
|
||||
, Metal
|
||||
, MetalKit
|
||||
, CoreFoundation
|
||||
, ApplicationServices
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
libsrtp = fetchFromGitHub {
|
||||
owner = "cisco";
|
||||
repo = "libsrtp";
|
||||
|
||||
# https://github.com/desktop-app/tg_owt/commit/6894e86eef8809d42b66eb85e376006f2a816a56
|
||||
rev = "a566a9cfcd619e8327784aa7cff4a1276dc1e895";
|
||||
sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2022-04-13";
|
||||
version = "0-unstable-2024-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396";
|
||||
sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM=";
|
||||
rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b";
|
||||
sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./tg_owt.patch
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/desktop-app/tg_owt/commit/0614aac699b1a53242ffe2664e3724533bf64f97.patch";
|
||||
hash = "sha256-iCdX518CB/RboDFhl3opnwcAgtqpNWZzYtV75Q+WB6Y=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/desktop-app/tg_owt/commit/9d120195334db4f232c925529aa7601656dc59d7.patch";
|
||||
hash = "sha256-k99OBCdE2eQVyXEyvreEqVtzC8Xfdolbgd1Z7lV2ceE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r src/third_party/libsrtp
|
||||
cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
|
||||
--replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \
|
||||
--replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \
|
||||
--replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \
|
||||
|
|
@ -101,10 +58,10 @@ stdenv.mkDerivation {
|
|||
libjpeg
|
||||
openssl
|
||||
libopus
|
||||
ffmpeg_4
|
||||
ffmpeg
|
||||
protobuf
|
||||
openh264
|
||||
usrsctp
|
||||
crc32c
|
||||
libvpx
|
||||
abseil-cpp
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
|
|
@ -121,7 +78,7 @@ stdenv.mkDerivation {
|
|||
mesa
|
||||
libdrm
|
||||
libGL
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Cocoa
|
||||
AppKit
|
||||
IOKit
|
||||
|
|
@ -137,7 +94,7 @@ stdenv.mkDerivation {
|
|||
MetalKit
|
||||
CoreFoundation
|
||||
ApplicationServices
|
||||
];
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
--- a/src/modules/include/module_common_types_public.h
|
||||
+++ b/src/modules/include/module_common_types_public.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||
#define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
|
||||
#include "absl/types/optional.h"
|
||||
diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h
|
||||
index 28c95ea9..790b0b73 100644
|
||||
--- a/src/common_video/h265/h265_pps_parser.h
|
||||
+++ b/src/common_video/h265/h265_pps_parser.h
|
||||
@@ -13,6 +13,8 @@
|
||||
|
||||
#include "absl/types/optional.h"
|
||||
|
||||
+#include <stdint.h>
|
||||
+
|
||||
namespace rtc {
|
||||
class BitBuffer;
|
||||
}
|
||||
--- a/src/rtc_base/third_party/base64/base64.h
|
||||
+++ b/src/rtc_base/third_party/base64/base64.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
#define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
--- a/src/modules/audio_processing/transient/file_utils.h
|
||||
+++ b/src/modules/audio_processing/transient/file_utils.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
|
||||
#define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "rtc_base/system/file_wrapper.h"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }:
|
||||
{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "${kotatogram-desktop.pname}-with-webkit";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||
mkdir -p $out/bin
|
||||
makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \
|
||||
--prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]}
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]}
|
||||
'';
|
||||
meta = kotatogram-desktop.meta // {
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ];
|
||||
maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ];
|
||||
mainProgram = "rslsync";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,6 @@ stdenv.mkDerivation {
|
|||
mainProgram = "qtwirediff";
|
||||
homepage = "https://github.com/aaptel/qtwirediff";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ janik ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ buildGoModule rec {
|
|||
description = "Unofficial GUI wrapper around the Tailscale CLI client";
|
||||
homepage = "https://github.com/DeedleFake/trayscale";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ patka ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "trayscale";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Tiny emulator for AnyTone radios";
|
||||
homepage = "https://github.com/hmatuschek/anytone-emu";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ janik ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "anytone-emu";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
description = "GUI application and command line tool for programming DMR radios";
|
||||
homepage = "https://dm3mat.darc.de/qdmr/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ janik _0x4A6F ];
|
||||
maintainers = with lib.maintainers; [ _0x4A6F ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iqtree";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iqtree";
|
||||
repo = "iqtree2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dnUFllqcABB3JDYoCwPGtIYD/h5lzX2XKOroDpijPpU=";
|
||||
hash = "sha256-ld+9vPJRVHMEe5/igqRr6RkISY2ipfGkJFHDOSZuAmg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,32 +8,37 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "Dafny";
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dafny-lang";
|
||||
repo = "dafny";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3t0drxM7PZzrLbxBKYa6Gja2u6GK6Pc+ejoswag3P3k=";
|
||||
hash = "sha256-XoSk08TVv17YyuTsRJ25e6bwSwKIF2+HjF5nFaul8+M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${
|
||||
writeScript "fake-gradlew-for-dafny" ''
|
||||
mkdir -p build/libs/
|
||||
javac $(find -name "*.java" | grep "^./src/main") -d classes
|
||||
jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny
|
||||
''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
|
||||
postPatch =
|
||||
let
|
||||
# This file wasn't updated between 4.6.0 and 4.7.0.
|
||||
runtimeJarVersion = "4.6.0";
|
||||
in
|
||||
''
|
||||
cp ${
|
||||
writeScript "fake-gradlew-for-dafny" ''
|
||||
mkdir -p build/libs/
|
||||
javac $(find -name "*.java" | grep "^./src/main") -d classes
|
||||
jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny
|
||||
''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
|
||||
|
||||
# Needed to fix
|
||||
# "error NETSDK1129: The 'Publish' target is not supported without
|
||||
# specifying a target framework. The current project targets multiple
|
||||
# frameworks, you must specify the framework for the published
|
||||
# application."
|
||||
substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
|
||||
--replace TargetFrameworks TargetFramework \
|
||||
--replace "netstandard2.0;net452" net6.0
|
||||
'';
|
||||
# Needed to fix
|
||||
# "error NETSDK1129: The 'Publish' target is not supported without
|
||||
# specifying a target framework. The current project targets multiple
|
||||
# frameworks, you must specify the framework for the published
|
||||
# application."
|
||||
substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
|
||||
--replace-warn TargetFrameworks TargetFramework \
|
||||
--replace-warn "netstandard2.0;net452" net6.0
|
||||
'';
|
||||
|
||||
buildInputs = [ jdk11 ];
|
||||
nugetDeps = ./deps.nix;
|
||||
|
|
|
|||
25
pkgs/applications/science/logic/dafny/deps.nix
generated
25
pkgs/applications/science/logic/dafny/deps.nix
generated
|
|
@ -3,18 +3,19 @@
|
|||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "Boogie"; version = "3.1.3"; sha256 = "0xzc7s0rjb8dhdkdf71g6pdsnyhbl534xpwd8gbx6g16a87iqx6i"; })
|
||||
(fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.3"; sha256 = "0a7v2jkkbh59pyc5nz4avszm3dbmp4amkmr6lvn0gyc3hxgn8d3k"; })
|
||||
(fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.3"; sha256 = "1h94yl4ymhd2g14i5w8lnnh2zw7gx65qydzvv8cm8d5yn64gch63"; })
|
||||
(fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.3"; sha256 = "0b1h1lz997lgyq34bx3ngnhgcrw8j4qvsa6iygb6bydxz7rirrf4"; })
|
||||
(fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.3"; sha256 = "1aq0gdz1xkmp82c67vrmyvkncfbbj5zxrsg78lsmmi22h9qbkzm3"; })
|
||||
(fetchNuGet { pname = "Boogie.Core"; version = "3.1.3"; sha256 = "0yhl272lv9lncjval2z7zl9wavlxx8bivj467zl2zzbrxw2k5wz8"; })
|
||||
(fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.3"; sha256 = "0p0zp329h6mddbswm3pdcyvy03y69vyznv11ph6bkpya21lsxqy7"; })
|
||||
(fetchNuGet { pname = "Boogie.Graph"; version = "3.1.3"; sha256 = "1p8vb4x4iy7f0ycwb8f71j9a2ci8irwg3rvad2hg3rgbihbwp1qj"; })
|
||||
(fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.3"; sha256 = "06qlgi9f70r2w7w6h9qw3lx9dd4pbddpdplqjxi090rpry6dhrbz"; })
|
||||
(fetchNuGet { pname = "Boogie.Model"; version = "3.1.3"; sha256 = "0fbvnrghaq17fdpjx12axxrrjp1mh99skaznmvxd1ylsqqnn4cbk"; })
|
||||
(fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.3"; sha256 = "0x7gpc7m04in2gzdn4jgjphd2xjqrdfmh84wzwnwpvi5wyn869jc"; })
|
||||
(fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.3"; sha256 = "0dyndhqz1yf9qnq9mw73g53rnz0xfbdbi3yk6pg7fdm1m3363h5p"; })
|
||||
(fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.3"; sha256 = "1bl83727zc1rhskx548p5pa27804n3f5i9n233jvcz6n6bfjn74k"; })
|
||||
(fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.6"; sha256 = "1c6z13dz0sbkmk4ay64aihy7s7xlfdvhpcknxhw1m1b0yly5qj6b"; })
|
||||
(fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.6"; sha256 = "1hxcpc45f32g3jpaw7mg6k9qsppcb3p20wxv4d4dc3nz0r52lrmr"; })
|
||||
(fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.6"; sha256 = "1qk7w7c40fpkvvarbgi1bkdcxpn12r0lqngpwwjw8i7nk84ni5gl"; })
|
||||
(fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.6"; sha256 = "11981gfa0n4s214yilnxqhh1clr4l78iqlws6gv01z1n6rxgbyla"; })
|
||||
(fetchNuGet { pname = "Boogie.Core"; version = "3.1.6"; sha256 = "0sgj6i1hvp90g2zfqs1aly500xnv3fq9d4cfgii5kpza8vgm7w4g"; })
|
||||
(fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.6"; sha256 = "08vxxwcnkykcngihkp0bvfwkgwxb3nnqjp5f1vz4bnw708xs0ydg"; })
|
||||
(fetchNuGet { pname = "Boogie.Graph"; version = "3.1.6"; sha256 = "0fzj65pnky8i83jj2h9nszij25a46z68fy2sm3pxwlg678nmx2jz"; })
|
||||
(fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.6"; sha256 = "0lfljb9brnr79hp1f0ff6fcy51ml66pjj102jk4pqpmsjwvcjx43"; })
|
||||
(fetchNuGet { pname = "Boogie.Model"; version = "3.1.6"; sha256 = "0546b27mxv97v7qilb1carbwip0q7sz9zz7sxizpww6yc3j8w8if"; })
|
||||
(fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.1.6"; sha256 = "1x1f35g0kxzhxvw4icmbvkik16py47j6h04gj0ckwbny9qmglaby"; })
|
||||
(fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.6"; sha256 = "0mqlpwfxgv9dd773254rrbgbjb5mpa3xkvlq32ml752h36j8m2r9"; })
|
||||
(fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.6"; sha256 = "0p7axpjn4qg191bs7b33zf9l336bdznvxp3305z2ssnkakjx247h"; })
|
||||
(fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.6"; sha256 = "05z2lr92hbllikv65gh7m3i879fnn6pjn2acf133sijx9b1jixdb"; })
|
||||
(fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; })
|
||||
(fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; })
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Real-Time Appearance-Based 3D Mapping";
|
||||
homepage = "https://introlab.github.io/rtabmap/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://timelens.blinry.org";
|
||||
changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ janik ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "timelens";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open-vm-tools";
|
||||
version = "12.4.0";
|
||||
version = "12.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "open-vm-tools";
|
||||
rev = "stable-${finalAttrs.version}";
|
||||
hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8=";
|
||||
hash = "sha256-VMnxWKGBgwnkP9eSVm///d6THzzWgUe5kNj/lGVBVlc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/open-vm-tools";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pipBuildHook, pypaBuildHook }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pypaBuildHook }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pname = "podman-compose";
|
||||
pyproject = true;
|
||||
|
||||
|
|
@ -9,10 +9,9 @@ buildPythonApplication rec {
|
|||
repo = "podman-compose";
|
||||
owner = "containers";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uNgzdLrnDIABtt0L2pvsil14esRzl0XcWohgf7Oksr8=";
|
||||
hash = "sha256-40RatexY/6eRfCodaiBeJpyt1sDUj2STSPL0gBECdRs=";
|
||||
};
|
||||
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@
|
|||
meta = with lib; {
|
||||
description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)";
|
||||
mainProgram = "prefetch-npm-deps";
|
||||
maintainers = with maintainers; [ lilyinstarlight winter ];
|
||||
maintainers = with maintainers; [ winter ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
, crateLicenseFile
|
||||
, crateLinks
|
||||
, crateName
|
||||
, crateType
|
||||
, crateReadme
|
||||
, crateRenames
|
||||
, crateRepository
|
||||
|
|
@ -209,6 +210,11 @@ in ''
|
|||
EXTRA_LINK_LIBS=$(sed -n "s/^cargo::\{0,1\}rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
|
||||
EXTRA_LINK_SEARCH=$(sed -n "s/^cargo::\{0,1\}rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
|
||||
|
||||
${lib.optionalString (lib.elem "cdylib" crateType) ''
|
||||
CRATE_TYPE_IS_CDYLIB="true"
|
||||
EXTRA_CDYLIB_LINK_ARGS=$(sed -n "s/^cargo::\{0,1\}rustc-cdylib-link-arg=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ')
|
||||
''}
|
||||
|
||||
# We want to read part of every line that has cargo:rustc-env= prefix and
|
||||
# export it as environment variables. This turns out tricky if the lines
|
||||
# have spaces: we can't wrap the command in double quotes as that captures
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ crate_: lib.makeOverridable
|
|||
|
||||
|
||||
configurePhase = configureCrate {
|
||||
inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription
|
||||
inherit crateName crateType buildDependencies completeDeps completeBuildDeps crateDescription
|
||||
crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks
|
||||
extraLinkFlags extraRustcOptsForBuildRs
|
||||
crateLicense crateLicenseFile crateReadme crateRepository crateRustVersion
|
||||
|
|
|
|||
|
|
@ -114,6 +114,12 @@ setup_link_paths() {
|
|||
tr '\n' ' ' < target/link > target/link_
|
||||
LINK=$(cat target/link_)
|
||||
fi
|
||||
|
||||
# Add "rustc-cdylib-link-arg" as linker arguments
|
||||
# https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-cdylib-link-arg
|
||||
if [[ -n "$CRATE_TYPE_IS_CDYLIB" ]]; then
|
||||
EXTRA_BUILD+=" $EXTRA_CDYLIB_LINK_ARGS"
|
||||
fi
|
||||
}
|
||||
|
||||
search_for_bin_path() {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
passthru.updateScript = lib.getExe (writeShellApplication {
|
||||
name = "arc-browser-update-script";
|
||||
runtimeInputs = [ curl common-updater-scripts ];
|
||||
|
|
|
|||
72
pkgs/by-name/as/asfa/package.nix
Normal file
72
pkgs/by-name/as/asfa/package.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
darwin,
|
||||
help2man,
|
||||
openssl,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "0.10.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "obreitwi";
|
||||
repo = "asfa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MnhnwtZmPFhOuiqNiaxJnPu88JOdlpvyVy0YGphblBc=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "asfa";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-/bRBP/NzcNOXl/nANeOYouUAo3NNbtbV9fxIJrNajYQ=";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
help2man
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# checks disabled because tests need to be run against (docker-based) ephemeral ssh-server
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "man/man1"
|
||||
help2man -o "man/man1/asfa.1" "$out/bin/asfa"
|
||||
|
||||
# Generate info about all subcommands except for 'help' (which leads to error)
|
||||
"$out/bin/asfa" --help | awk 'enabled && $1 != "help" { print $1 } /^SUBCOMMANDS:$/ { enabled=1 }' \
|
||||
| while read -r cmd; do
|
||||
help2man \
|
||||
"--version-string=${version}" \
|
||||
-o "man/man1/asfa-$cmd.1" \
|
||||
"$out/bin/asfa $cmd"
|
||||
done
|
||||
|
||||
installManPage man/man1/*.1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Avoid sending file attachments by uploading them via SSH to a remote site and sharing a publicly-accessible URL with non-guessable (hash-based) prefix instead";
|
||||
homepage = "https://github.com/obreitwi/asfa";
|
||||
changelog = "https://github.com/obreitwi/asfa/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ obreitwi ];
|
||||
mainProgram = "asfa";
|
||||
};
|
||||
}
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "backlight-auto";
|
||||
homepage = "https://len.falken.directory/backlight-auto.html";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lf- ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, python3
|
||||
, darwin
|
||||
, nixosTests
|
||||
, xcbuild
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
|
|
@ -27,6 +28,7 @@ buildNpmPackage rec {
|
|||
python3
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.cctools
|
||||
xcbuild.xcrun
|
||||
];
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ buildNpmPackage rec {
|
|||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "blockbench";
|
||||
maintainers = with lib.maintainers; [
|
||||
ckie
|
||||
tomasajt
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,20 +28,20 @@ let
|
|||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "bruno";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XprUu4Dp7ER8YC1uO4kkzTZLsJtoOFH15elnkxUn7/c=";
|
||||
hash = "sha256-NnRM+ERz5pViQ+rIRXAH3puFdhccpgQMQ+ICZQELA18=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-BVCyZKhSBNJDmhnO68ULj5aMINFQIIlwlGqwjGkOoEI=";
|
||||
npmDepsHash = "sha256-aw4jOvlfZHCRrgoXT69XrMYe40YXULrfbVG1pQAFGr4=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.cecill-c;
|
||||
maintainers = [
|
||||
lib.maintainers.AndersonTorres
|
||||
lib.maintainers.lilyinstarlight
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = {
|
||||
description = "Tool for analyzing Clang's -ftime-trace files";
|
||||
homepage = "https://github.com/aras-p/ClangBuildAnalyzer";
|
||||
maintainers = with lib.maintainers; [ lf- ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.unlicense;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "ClangBuildAnalyzer";
|
||||
|
|
|
|||
46
pkgs/by-name/cq/cq/package.nix
Normal file
46
pkgs/by-name/cq/cq/package.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, buildGraalvmNativeImage
|
||||
, graalvmCEPackages
|
||||
}:
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "cq";
|
||||
version = "2024.06.24-12.10";
|
||||
|
||||
# we need both src (the prebuild jar)
|
||||
src = fetchurl {
|
||||
url = "https://github.com/markus-wa/cq/releases/download/${version}/cq.jar";
|
||||
hash = "sha256-iULV+j/AuGVYPYhbOTQTKd3n+VZhWQYBRE6cRiaa1/M=";
|
||||
};
|
||||
|
||||
# and build-src (for the native-image build process)
|
||||
build-src = fetchFromGitHub {
|
||||
owner = "markus-wa";
|
||||
repo = "cq";
|
||||
rev = version;
|
||||
hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
|
||||
};
|
||||
|
||||
graalvmDrv = graalvmCEPackages.graalvm-ce;
|
||||
|
||||
executable = "cq";
|
||||
|
||||
# copied verbatim from the upstream build script https://github.com/markus-wa/cq/blob/main/package/build-native.sh#L5
|
||||
extraNativeImageBuildArgs = [
|
||||
"--report-unsupported-elements-at-runtime"
|
||||
"--initialize-at-build-time"
|
||||
"--no-server"
|
||||
"-H:ReflectionConfigurationFiles=${build-src}/package/reflection-config.json"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Clojure Query: A Command-line Data Processor for JSON, YAML, EDN, XML and more";
|
||||
homepage = "https://github.com/markus-wa/cq";
|
||||
changelog = "https://github.com/markus-wa/cq/releases/releases/tag/${version}";
|
||||
license = licenses.epl20;
|
||||
maintainers = with maintainers; [ farcaller ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
, gobject-introspection
|
||||
, gtk4
|
||||
, pango
|
||||
, overrideSDK
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, testers
|
||||
|
|
@ -28,8 +29,12 @@ let
|
|||
hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94=";
|
||||
};
|
||||
cargoHash = "sha256-GOX7V6NLEMP06nMeRZINwcWCaHwK6T3nkRKl4e25DPg=";
|
||||
|
||||
buildRustPackage' = rustPlatform.buildRustPackage.override {
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
buildRustPackage' {
|
||||
inherit pname version src cargoHash;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
4
pkgs/by-name/di/discordchatexporter-cli/deps.nix
generated
4
pkgs/by-name/di/discordchatexporter-cli/deps.nix
generated
|
|
@ -16,6 +16,8 @@
|
|||
(fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; sha256 = "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n"; })
|
||||
(fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "8.0.3"; sha256 = "0jkl986gnh2a39v5wbab47qyh1g9a64dgh5s67vppcay8hd42c4n"; })
|
||||
(fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.16.0"; sha256 = "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m"; })
|
||||
(fetchNuGet { pname = "YoutubeExplode"; version = "6.3.14"; sha256 = "12w9zz6y7cdw6p2gvr34r4qcl35hh19zn9fm0risrrcs8577msxs"; })
|
||||
(fetchNuGet { pname = "YoutubeExplode"; version = "6.3.16"; sha256 = "1f6d47g1qmmahx6pn2sp0fff7hsmdqwm7z09j47hs6r1yn9a7kyj"; })
|
||||
]
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "discordchatexporter-cli";
|
||||
version = "2.43.1";
|
||||
version = "2.43.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyrrrz";
|
||||
repo = "discordchatexporter";
|
||||
rev = version;
|
||||
hash = "sha256-MLOWZJehajB002SqBW2HJTjr00eU9RV+Weu3rmgoEew=";
|
||||
hash = "sha256-r9bvTgqKQY605BoUlysSz4WJMxn2ibNh3EhoMYCfV3c=";
|
||||
};
|
||||
|
||||
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (variants.${variant}) description;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "gmic_qt";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres lilyinstarlight ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.cecill21;
|
||||
maintainers = [
|
||||
lib.maintainers.AndersonTorres
|
||||
lib.maintainers.lilyinstarlight
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Very fast link checker for CI";
|
||||
homepage = "https://github.com/untitaker/hyperlink";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.rossabaker ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "hyperlink";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intune-portal";
|
||||
version = "1.2404.25-jammy";
|
||||
version = "1.2405.17-jammy";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb";
|
||||
hash = "sha256-ZRJdhhDwXeOjIx7Ml4VvPUOotnJQ9f73nsYzgm6SQC8=";
|
||||
hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ buildGoModule rec {
|
|||
homepage = "https://ipam.lauka.net/";
|
||||
changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ janik ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "ipam";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,19 +22,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kooha";
|
||||
version = "2.2.4";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeaDve";
|
||||
repo = "Kooha";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D/+tsIfcXrlwwL6vSLRsiAp7wMVtIgzjNNd2uk+9bco=";
|
||||
hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-iDyhK2k2RB7CvtW+91isVzIFOl2/Loh+Bvneu4TGfn0=";
|
||||
hash = "sha256-m5y/VfjTJgK+/ZjsMo/9zPVxcV3kuwXb+HNdXR6hkV4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
53
pkgs/by-name/li/libisocodes/package.nix
Normal file
53
pkgs/by-name/li/libisocodes/package.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
vala,
|
||||
pkg-config,
|
||||
gobject-introspection,
|
||||
libxml2,
|
||||
libgee,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libisocodes";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toddy15";
|
||||
repo = "libisocodes";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-a2gVqiZXDiH1byEw/s3MqDQBBZ/bmnw8OyllGYfYykQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libxml2
|
||||
libgee
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Easily access XML data of the iso-codes package";
|
||||
longDescription = ''
|
||||
This library can be used to easily access XML data of
|
||||
the iso-codes package. It will provide an abstraction
|
||||
layer to handle both the version 3 and the upcoming
|
||||
version 4 of iso-codes. Moreover, all available
|
||||
translations can be used as well.
|
||||
|
||||
This library makes use of the GObject introspection
|
||||
features, so that it is accessible from a variety of
|
||||
programming languages, for example C, Vala, Ruby,
|
||||
Python, Perl, Lua, JavaScript, PHP and many more.
|
||||
'';
|
||||
homepage = "https://github.com/toddy15/libisocodes";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
50
pkgs/by-name/li/libzim-glib/package.nix
Normal file
50
pkgs/by-name/li/libzim-glib/package.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
vala,
|
||||
pkg-config,
|
||||
gobject-introspection,
|
||||
glib,
|
||||
zimlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libzim-glib";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "birros";
|
||||
repo = "libzim-glib";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-C1f/ULTJIHvt/LCSRw3dsGAWUkb1i4xaCmW1+QBZd2c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
zimlib
|
||||
];
|
||||
|
||||
# requires downloading test sample of a specific zimlib version
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Partial GObject/C bindings for libzim";
|
||||
homepage = "https://github.com/birros/libzim-glib";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "livekit-cli";
|
||||
version = "1.4.3";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livekit";
|
||||
repo = "livekit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IARQ5yxktem729SrxdT5i+7+1dY60xw+2KZU+unlsKM=";
|
||||
hash = "sha256-J5tg3nm2pEemEZcIpObcxH+G4ByzvUtoSyy92CcWr6M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3ePOwEEPexM+k0atW/mW4yNVtnsEXwv1w5NVQLyexbs=";
|
||||
vendorHash = "sha256-ywHTIuiZaoY3p7hTsnImcCpuwMXHQZcnRsWerIlOU4o=";
|
||||
|
||||
subPackages = [ "cmd/livekit-cli" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation (oldAttrs: {
|
|||
mainProgram = "logid";
|
||||
homepage = "https://github.com/PixlOne/logiops";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "logid";
|
||||
homepage = "https://github.com/PixlOne/logiops";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxcfs";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "lxcfs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU=";
|
||||
sha256 = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/FWDekker/mommy/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.unlicense;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ckie ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "mommy";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ let
|
|||
# until these llama-cpp binaries can have their runpath patched
|
||||
"--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'"
|
||||
] ++ lib.optionals enableRocm [
|
||||
"--suffix LD_LIBRARY_PATH : '${rocmPath}'"
|
||||
"--set-default HIP_PATH '${rocmPath}'"
|
||||
];
|
||||
wrapperArgs = builtins.concatStringsSep " " wrapperOptions;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ buildGoModule {
|
|||
mainProgram = "opengist";
|
||||
homepage = "https://github.com/thomiceli/opengist";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ lf- ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@
|
|||
homepage = "https://github.com/paratestphp/paratest";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "paratest";
|
||||
maintainers = with lib.maintainers; [ patka ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "passt";
|
||||
version = "2024_05_23.765eb0b";
|
||||
version = "2024_06_24.1ee2eca";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4i+83uv7fXeK4/0bf1FYGALKwjCqCx51rQAGTOnbrNE=";
|
||||
hash = "sha256-Q4AbpzJ4Gbu1ArdjzZCf0GmTz0nWZN+kEuhLPT8uPqg=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: {
|
|||
homepage = "https://pestphp.com";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "pest";
|
||||
maintainers = with lib.maintainers; [ patka ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -30,6 +30,6 @@ php.buildComposerProject (finalAttrs: {
|
|||
homepage = "https://github.com/phpactor/phpactor";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "phpactor";
|
||||
maintainers = [ lib.maintainers.patka ] ++ lib.teams.php.members;
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: {
|
|||
homepage = "https://phpunit.de";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "phpunit";
|
||||
maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members;
|
||||
maintainers = with lib.maintainers; [ onny ] ++ lib.teams.php.members;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
31
pkgs/by-name/pl/plasmusic-toolbar/package.nix
Normal file
31
pkgs/by-name/pl/plasmusic-toolbar/package.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, kdePackages
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plasmusic-toolbar";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccatterina";
|
||||
repo = "plasmusic-toolbar";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yc6hUi5tICpG3SacYnWVApYQXPN4Yrw6+BFd9ghlqxA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/plasma/plasmoids/plasmusic-toolbar
|
||||
cp -r src/* $out/share/plasma/plasmoids/plasmusic-toolbar
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "KDE Plasma widget that shows currently playing song information and provide playback controls.";
|
||||
homepage = "https://github.com/ccatterina/plasmusic-toolbar";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
inherit (kdePackages.kwindowsystem.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -33,11 +33,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plasticity";
|
||||
version = "24.1.6";
|
||||
version = "24.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
|
||||
hash = "sha256-gGfDsAqg0PkORrOEvBWLpKgLv5a+M9Rj+oC+jF1gYqA=";
|
||||
hash = "sha256-HVAQXDfj/5UoOGvgrOW09xFeVv4MF/wXqxtRdwZAqso=";
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
having a black belt in shell scripting.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ afldcr Br1ght0ne moni ckie ];
|
||||
maintainers = with maintainers; [ afldcr Br1ght0ne moni ];
|
||||
mainProgram = "polybar";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
"celery"
|
||||
"css-inline"
|
||||
"cssutils"
|
||||
"django-compressor"
|
||||
"django-csp"
|
||||
"django-filter"
|
||||
"django-hierarkey"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue