gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2023-12-07 00:12:43 +00:00
committed by GitHub
parent d8a4ff618f 747224bf39
commit 9f9ad84bd0
306 changed files with 4993 additions and 7241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.mailmap
+2
View File
@@ -12,3 +12,5 @@ Sandro Jäckel <sandro.jaeckel@gmail.com> <sandro.jaeckel@sap.com>
superherointj <5861043+superherointj@users.noreply.github.com>
Vladimír Čunát <v@cunat.cz> <vcunat@gmail.com>
Vladimír Čunát <v@cunat.cz> <vladimir.cunat@nic.cz>
Yifei Sun <ysun@hey.com> StepBroBD <Hi@StepBroBD.com>
Yifei Sun <ysun@hey.com> <ysun+git@stepbrobd.com>
CONTRIBUTING.md
+10 -9
View File
@@ -26,7 +26,7 @@ This file contains general contributing information, but individual parts also h
This section describes in some detail how changes can be made and proposed with pull requests.
> **Note**
> [!Note]
> Be aware that contributing implies licensing those contributions under the terms of [COPYING](./COPYING), an MIT-like license.
0. Set up a local version of Nixpkgs to work with using GitHub and Git
@@ -273,7 +273,7 @@ Once a pull request has been merged into `master`, a backport pull request to th
### Automatically backporting changes
> **Note**
> [!Note]
> You have to be a [Nixpkgs maintainer](./maintainers) to automatically create a backport pull request.
Add the [`backport release-YY.MM` label](https://github.com/NixOS/nixpkgs/labels?q=backport) to the pull request on the `master` branch.
@@ -285,16 +285,17 @@ This can be done on both open or already merged pull requests.
To manually create a backport pull request, follow [the standard pull request process][pr-create], with these notable differences:
- Use `release-YY.MM` for the base branch, both for the local branch and the pull request.
> **Warning**
> Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit
> [!Warning]
> Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit
- Instead of manually making and committing the changes, use [`git cherry-pick -x`](https://git-scm.com/docs/git-cherry-pick) for each commit from the pull request you'd like to backport.
Either `git cherry-pick -x <commit>` when the reason for the backport is obvious (such as minor versions, fixes, etc.), otherwise use `git cherry-pick -xe <commit>` to add a reason for the backport to the commit message.
Here is [an example](https://github.com/nixos/nixpkgs/commit/5688c39af5a6c5f3d646343443683da880eaefb8) of this.
> **Warning**
> Ensure the commits exists on the master branch.
> In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
> [!Warning]
> Ensure the commits exists on the master branch.
> In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
- In the pull request description, link to the original pull request to `master`.
The pull request title should include `[YY.MM]` matching the release you're backporting to.
@@ -305,7 +306,7 @@ To manually create a backport pull request, follow [the standard pull request pr
## How to review pull requests
[pr-review]: #how-to-review-pull-requests
> **Warning**
> [!Warning]
> The following section is a draft, and the policy for reviewing is still being discussed in issues such as [#11166](https://github.com/NixOS/nixpkgs/issues/11166) and [#20836](https://github.com/NixOS/nixpkgs/issues/20836).
The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project.
@@ -384,7 +385,7 @@ By keeping the `staging-next` branch separate from `staging`, this batching does
In order for the `staging` and `staging-next` branches to be up-to-date with the latest commits on `master`, there are regular _automated_ merges from `master` into `staging-next` and `staging`.
This is implemented using GitHub workflows [here](.github/workflows/periodic-merge-6h.yml) and [here](.github/workflows/periodic-merge-24h.yml).
> **Note**
> [!Note]
> Changes must be sufficiently tested before being merged into any branch.
> Hydra builds should not be used as testing platform.
doc/README.md
+1 -1
View File
@@ -48,7 +48,7 @@ It uses the widely compatible [header attributes](https://github.com/jgm/commonm
## Syntax {#sec-contributing-markup}
```
> **Note**
> [!Note]
> NixOS option documentation does not support headings in general.
#### Inline Anchors
maintainers/maintainer-list.nix
+10 -5
View File
@@ -10793,6 +10793,12 @@
fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817";
}];
};
lukas-heiligenbrunner = {
email = "lukas.heiligenbrunner@gmail.com";
github = "lukas-heiligenbrunner";
githubId = 30468956;
name = "Lukas Heiligenbrunner";
};
lukaswrz = {
email = "lukas@wrz.one";
github = "lukaswrz";
@@ -17343,13 +17349,12 @@
name = "Stel Abrego";
};
stepbrobd = {
name = "StepBroBD";
github = "StepBroBD";
name = "Yifei Sun";
email = "ysun@hey.com";
github = "stepbrobd";
githubId = 81826728;
email = "Hi@StepBroBD.com";
matrix = "@stepbrobd:matrix.org";
keys = [{
fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51";
fingerprint = "AC7C 52E6 BA2F E8DE 8F0F 5D78 D973 170F 9B86 DB70";
}];
};
stephank = {
maintainers/team-list.nix
+12
View File
@@ -562,6 +562,18 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
lxc = {
members = [
aanderse
adamcstephens
jnsgruk
megheaiulian
mkg20001
];
scope = "All things linuxcontainers. LXC, Incus, LXD and related packages.";
shortName = "lxc";
};
lxqt = {
members = [
romildo
nixos/modules/module-list.nix
+1
View File
@@ -1360,6 +1360,7 @@
./services/web-servers/molly-brown.nix
./services/web-servers/nginx/default.nix
./services/web-servers/nginx/gitweb.nix
./services/web-servers/nginx/tailscale-auth.nix
./services/web-servers/phpfpm/default.nix
./services/web-servers/pomerium.nix
./services/web-servers/rustus.nix
nixos/modules/services/backup/borgbackup.nix
+18 -15
View File
@@ -602,53 +602,56 @@ in {
};
extraArgs = mkOption {
type = types.str;
type = with types; coercedTo (listOf str) escapeShellArgs str;
description = lib.mdDoc ''
Additional arguments for all {command}`borg` calls the
service has. Handle with care.
'';
default = "";
example = "--remote-path=/path/to/borg";
default = [ ];
example = [ "--remote-path=/path/to/borg" ];
};
extraInitArgs = mkOption {
type = types.str;
type = with types; coercedTo (listOf str) escapeShellArgs str;
description = lib.mdDoc ''
Additional arguments for {command}`borg init`.
Can also be set at runtime using `$extraInitArgs`.
'';
default = "";
example = "--append-only";
default = [ ];
example = [ "--append-only" ];
};
extraCreateArgs = mkOption {
type = types.str;
type = with types; coercedTo (listOf str) escapeShellArgs str;
description = lib.mdDoc ''
Additional arguments for {command}`borg create`.
Can also be set at runtime using `$extraCreateArgs`.
'';
default = "";
example = "--stats --checkpoint-interval 600";
default = [ ];
example = [
"--stats"
"--checkpoint-interval 600"
];
};
extraPruneArgs = mkOption {
type = types.str;
type = with types; coercedTo (listOf str) escapeShellArgs str;
description = lib.mdDoc ''
Additional arguments for {command}`borg prune`.
Can also be set at runtime using `$extraPruneArgs`.
'';
default = "";
example = "--save-space";
default = [ ];
example = [ "--save-space" ];
};
extraCompactArgs = mkOption {
type = types.str;
type = with types; coercedTo (listOf str) escapeShellArgs str;
description = lib.mdDoc ''
Additional arguments for {command}`borg compact`.
Can also be set at runtime using `$extraCompactArgs`.
'';
default = "";
example = "--cleanup-commits";
default = [ ];
example = [ "--cleanup-commits" ];
};
};
}
nixos/modules/services/home-automation/home-assistant.nix
+3 -5
View File
@@ -11,14 +11,12 @@ let
# options shown in settings.
# We post-process the result to add support for YAML functions, like secrets or includes, see e.g.
# https://www.home-assistant.io/docs/configuration/secrets/
filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) cfg.config or {};
filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) (lib.recursiveUpdate customLovelaceModulesResources (cfg.config or {}));
configFile = pkgs.runCommandLocal "configuration.yaml" { } ''
cp ${format.generate "configuration.yaml" filteredConfig} $out
sed -i -e "s/'\!\([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out
'';
lovelaceConfig = if (cfg.lovelaceConfig == null) then {}
else (lib.recursiveUpdate customLovelaceModulesResources cfg.lovelaceConfig);
lovelaceConfigFile = format.generate "ui-lovelace.yaml" lovelaceConfig;
lovelaceConfigFile = format.generate "ui-lovelace.yaml" cfg.lovelaceConfig;
# Components advertised by the home-assistant package
availableComponents = cfg.package.availableComponents;
@@ -77,7 +75,7 @@ let
# Create parts of the lovelace config that reference lovelave modules as resources
customLovelaceModulesResources = {
lovelace.resources = map (card: {
url = "/local/nixos-lovelace-modules/${card.entrypoint or card.pname}.js?${card.version}";
url = "/local/nixos-lovelace-modules/${card.entrypoint or card.pname + ".js"}?${card.version}";
type = "module";
}) cfg.customLovelaceModules;
};
nixos/modules/services/logging/vector.nix
+5 -1
View File
@@ -51,13 +51,17 @@ in
{
ExecStart = "${getExe cfg.package} --config ${validateConfig conf}";
DynamicUser = true;
Restart = "no";
Restart = "always";
StateDirectory = "vector";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
# This group is required for accessing journald.
SupplementaryGroups = mkIf cfg.journaldAccess "systemd-journal";
};
unitConfig = {
StartLimitIntervalSec = 10;
StartLimitBurst = 5;
};
};
};
}
nixos/modules/services/networking/harmonia.nix
+5 -1
View File
@@ -29,6 +29,11 @@ in
config = lib.mkIf cfg.enable {
nix.settings.extra-allowed-users = [ "harmonia" ];
users.users.harmonia = {
isSystemUser = true;
group = "harmonia";
};
users.groups.harmonia = { };
systemd.services.harmonia = {
description = "harmonia binary cache service";
@@ -50,7 +55,6 @@ in
ExecStart = lib.getExe cfg.package;
User = "harmonia";
Group = "harmonia";
DynamicUser = true;
PrivateUsers = true;
DeviceAllow = [ "" ];
UMask = "0066";
nixos/modules/services/web-servers/nginx/tailscale-auth.nix
+158
View File
@@ -0,0 +1,158 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.nginx.tailscaleAuth;
in
{
options.services.nginx.tailscaleAuth = {
enable = mkEnableOption (lib.mdDoc "Enable tailscale.nginx-auth, to authenticate nginx users via tailscale.");
package = lib.mkPackageOptionMD pkgs "tailscale-nginx-auth" {};
user = mkOption {
type = types.str;
default = "tailscale-nginx-auth";
description = lib.mdDoc "User which runs tailscale-nginx-auth";
};
group = mkOption {
type = types.str;
default = "tailscale-nginx-auth";
description = lib.mdDoc "Group which runs tailscale-nginx-auth";
};
expectedTailnet = mkOption {
default = "";
type = types.nullOr types.str;
example = "tailnet012345.ts.net";
description = lib.mdDoc ''
If you want to prevent node sharing from allowing users to access services
across tailnets, declare your expected tailnets domain here.
'';
};
socketPath = mkOption {
default = "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock";
type = types.path;
description = lib.mdDoc ''
Path of the socket listening to nginx authorization requests.
'';
};
virtualHosts = mkOption {
type = types.listOf types.str;
default = [];
description = lib.mdDoc ''
A list of nginx virtual hosts to put behind tailscale.nginx-auth
'';
};
};
config = mkIf cfg.enable {
services.tailscale.enable = true;
services.nginx.enable = true;
users.users.${cfg.user} = {
isSystemUser = true;
inherit (cfg) group;
};
users.groups.${cfg.group} = { };
users.users.${config.services.nginx.user}.extraGroups = [ cfg.group ];
systemd.sockets.tailscale-nginx-auth = {
description = "Tailscale NGINX Authentication socket";
partOf = [ "tailscale-nginx-auth.service" ];
wantedBy = [ "sockets.target" ];
listenStreams = [ cfg.socketPath ];
socketConfig = {
SocketMode = "0660";
SocketUser = cfg.user;
SocketGroup = cfg.group;
};
};
systemd.services.tailscale-nginx-auth = {
description = "Tailscale NGINX Authentication service";
after = [ "nginx.service" ];
wants = [ "nginx.service" ];
requires = [ "tailscale-nginx-auth.socket" ];
serviceConfig = {
ExecStart = "${lib.getExe cfg.package}";
RuntimeDirectory = "tailscale-nginx-auth";
User = cfg.user;
Group = cfg.group;
BindPaths = [ "/run/tailscale/tailscaled.sock" ];
CapabilityBoundingSet = "";
DeviceAllow = "";
LockPersonality = true;
MemoryDenyWriteExecute = true;
PrivateDevices = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
RestrictNamespaces = true;
RestrictAddressFamilies = [ "AF_UNIX" ];
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallErrorNumber = "EPERM";
SystemCallFilter = [
"@system-service"
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
];
};
};
services.nginx.virtualHosts = genAttrs
cfg.virtualHosts
(vhost: {
locations."/auth" = {
extraConfig = ''
internal;
proxy_pass http://unix:${cfg.socketPath};
proxy_pass_request_body off;
# Upstream uses $http_host here, but we are using gixy to check nginx configurations
# gixy wants us to use $host: https://github.com/yandex/gixy/blob/master/docs/en/plugins/hostspoofing.md
proxy_set_header Host $host;
proxy_set_header Remote-Addr $remote_addr;
proxy_set_header Remote-Port $remote_port;
proxy_set_header Original-URI $request_uri;
proxy_set_header X-Scheme $scheme;
proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri;
'';
};
locations."/".extraConfig = ''
auth_request /auth;
auth_request_set $auth_user $upstream_http_tailscale_user;
auth_request_set $auth_name $upstream_http_tailscale_name;
auth_request_set $auth_login $upstream_http_tailscale_login;
auth_request_set $auth_tailnet $upstream_http_tailscale_tailnet;
auth_request_set $auth_profile_picture $upstream_http_tailscale_profile_picture;
proxy_set_header X-Webauth-User "$auth_user";
proxy_set_header X-Webauth-Name "$auth_name";
proxy_set_header X-Webauth-Login "$auth_login";
proxy_set_header X-Webauth-Tailnet "$auth_tailnet";
proxy_set_header X-Webauth-Profile-Picture "$auth_profile_picture";
${lib.optionalString (cfg.expectedTailnet != "") ''proxy_set_header Expected-Tailnet "${cfg.expectedTailnet}";''}
'';
});
};
meta.maintainers = with maintainers; [ phaer ];
}
nixos/modules/virtualisation/incus.nix
+3 -1
View File
@@ -5,7 +5,9 @@ let
preseedFormat = pkgs.formats.yaml { };
in
{
meta.maintainers = [ lib.maintainers.adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
options = {
virtualisation.incus = {
nixos/modules/virtualisation/lxc-container.nix
+3 -1
View File
@@ -1,7 +1,9 @@
{ lib, config, pkgs, ... }:
{
meta.maintainers = with lib.maintainers; [ adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
imports = [
./lxc-instance-common.nix
nixos/modules/virtualisation/lxc.nix
+12 -14
View File
@@ -2,21 +2,19 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.virtualisation.lxc;
in
{
###### interface
meta = {
maintainers = lib.teams.lxc.members;
};
options.virtualisation.lxc = {
enable =
mkOption {
type = types.bool;
lib.mkOption {
type = lib.types.bool;
default = false;
description =
lib.mdDoc ''
@@ -27,8 +25,8 @@ in
};
systemConfig =
mkOption {
type = types.lines;
lib.mkOption {
type = lib.types.lines;
default = "";
description =
lib.mdDoc ''
@@ -38,8 +36,8 @@ in
};
defaultConfig =
mkOption {
type = types.lines;
lib.mkOption {
type = lib.types.lines;
default = "";
description =
lib.mdDoc ''
@@ -49,8 +47,8 @@ in
};
usernetConfig =
mkOption {
type = types.lines;
lib.mkOption {
type = lib.types.lines;
default = "";
description =
lib.mdDoc ''
@@ -62,7 +60,7 @@ in
###### implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.lxc ];
environment.etc."lxc/lxc.conf".text = cfg.systemConfig;
environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig;
nixos/modules/virtualisation/lxcfs.nix
+6 -6
View File
@@ -2,18 +2,18 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.virtualisation.lxc.lxcfs;
in {
meta.maintainers = [ maintainers.mic92 ];
meta = {
maintainers = lib.teams.lxc.members;
};
###### interface
options.virtualisation.lxc.lxcfs = {
enable =
mkOption {
type = types.bool;
lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc ''
This enables LXCFS, a FUSE filesystem for LXC.
@@ -27,7 +27,7 @@ in {
};
###### implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
systemd.services.lxcfs = {
description = "FUSE filesystem for LXC";
wantedBy = [ "multi-user.target" ];
nixos/modules/virtualisation/lxd-agent.nix
+3 -1
View File
@@ -45,7 +45,9 @@ let
chown -R root:root "$PREFIX"
'';
in {
meta.maintainers = with lib.maintainers; [ adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
options = {
virtualisation.lxd.agent.enable = lib.mkEnableOption (lib.mdDoc "Enable LXD agent");
nixos/modules/virtualisation/lxd-virtual-machine.nix
+4
View File
@@ -6,6 +6,10 @@ let
then "ttyS0"
else "ttyAMA0"; # aarch64
in {
meta = {
maintainers = lib.teams.lxc.members;
};
imports = [
./lxc-instance-common.nix
nixos/modules/virtualisation/lxd.nix
+4 -2
View File
@@ -6,12 +6,14 @@ let
cfg = config.virtualisation.lxd;
preseedFormat = pkgs.formats.yaml {};
in {
meta = {
maintainers = lib.teams.lxc.members;
};
imports = [
(lib.mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally")
];
###### interface
options = {
virtualisation.lxd = {
enable = lib.mkOption {
nixos/tests/all-tests.nix
+1 -1
View File
@@ -163,7 +163,7 @@ in {
btrbk-no-timer = handleTest ./btrbk-no-timer.nix {};
btrbk-section-order = handleTest ./btrbk-section-order.nix {};
budgie = handleTest ./budgie.nix {};
buildbot = handleTest ./buildbot.nix {};
buildbot = handleTestOn [ "x86_64-linux" ] ./buildbot.nix {};
buildkite-agents = handleTest ./buildkite-agents.nix {};
c2fmzq = handleTest ./c2fmzq.nix {};
caddy = handleTest ./caddy.nix {};
nixos/tests/harmonia.nix
+3
View File
@@ -13,6 +13,9 @@
networking.firewall.allowedTCPPorts = [ 5000 ];
system.extraDependencies = [ pkgs.emptyFile ];
# check that extra-allowed-users is effective for harmonia
nix.settings.allowed-users = [];
};
client01 = {
nixos/tests/home-assistant.nix
+1 -1
View File
@@ -43,7 +43,7 @@ in {
# test loading custom components
customComponents = with pkgs.home-assistant-custom-components; [
prometheus-sensor
prometheus_sensor
];
# test loading lovelace modules
nixos/tests/incus/container.nix
+3 -1
View File
@@ -14,7 +14,9 @@ in
{
name = "incus-container";
meta.maintainers = with lib.maintainers; [ adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = { ... }: {
virtualisation = {
nixos/tests/incus/preseed.nix
+3 -1
View File
@@ -3,7 +3,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
{
name = "incus-preseed";
meta.maintainers = with lib.maintainers; [ adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = { lib, ... }: {
virtualisation = {
nixos/tests/incus/socket-activated.nix
+3 -1
View File
@@ -3,7 +3,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
{
name = "incus-socket-activated";
meta.maintainers = with lib.maintainers; [ adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = { lib, ... }: {
virtualisation = {
nixos/tests/incus/virtual-machine.nix
+3 -1
View File
@@ -19,7 +19,9 @@ in
{
name = "incus-virtual-machine";
meta.maintainers = with lib.maintainers; [ adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = {...}: {
virtualisation = {
nixos/tests/lxd/container.nix
+2 -2
View File
@@ -18,8 +18,8 @@ let
in {
name = "lxd-container";
meta = with pkgs.lib.maintainers; {
maintainers = [ patryk27 adamcstephens ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = { lib, ... }: {
nixos/tests/lxd/nftables.nix
+3 -3
View File
@@ -5,11 +5,11 @@
# iptables to nftables requires a full reboot, which is a bit hard inside NixOS
# tests.
import ../make-test-python.nix ({ pkgs, ...} : {
import ../make-test-python.nix ({ pkgs, lib, ...} : {
name = "lxd-nftables";
meta = with pkgs.lib.maintainers; {
maintainers = [ patryk27 ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = { lib, ... }: {
nixos/tests/lxd/preseed.nix
+1 -1
View File
@@ -4,7 +4,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } :
name = "lxd-preseed";
meta = {
maintainers = with lib.maintainers; [ adamcstephens ];
maintainers = lib.teams.lxc.members;
};
nodes.machine = { lib, ... }: {
nixos/tests/lxd/ui.nix
+2 -2
View File
@@ -1,8 +1,8 @@
import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "lxd-ui";
meta = with pkgs.lib.maintainers; {
maintainers = [ jnsgruk ];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = { lib, ... }: {
nixos/tests/lxd/virtual-machine.nix
+2 -2
View File
@@ -18,8 +18,8 @@ let
in {
name = "lxd-virtual-machine";
meta = with pkgs.lib.maintainers; {
maintainers = [adamcstephens];
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine = {lib, ...}: {
pkgs/README.md
+1 -1
View File
@@ -470,7 +470,7 @@ Preferred source hash type is sha256. There are several ways to get it.
in the package expression, attempt build and extract correct hash from error messages.
> **Warning**
> [!Warning]
> You must use one of these four fake hashes and not some arbitrarily-chosen hash.
> See [here][secure-hashes]
pkgs/applications/audio/airwindows-lv2/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "airwindows-lv2";
version = "22.0";
version = "26.0";
src = fetchFromSourcehut {
owner = "~hannes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4=";
sha256 = "sha256-CmNe70ii3WfQ6GGHVqTEyQ2HVubzoeoeN3JsCZSbsPM=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
pkgs/applications/audio/qpwgraph/default.nix
+2 -2
View File
@@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph";
version = "0.6.0";
version = "0.6.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${finalAttrs.version}";
sha256 = "sha256-wJ+vUw16yBBFjMdJogF1nkLnAh3o2ndN9+0png8ZVJ4=";
sha256 = "sha256-oB8/q0igSZoaDzKzgmGAECU0qJwO67t9qWw+fB2vfxg=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
pkgs/applications/blockchains/ledger-live-desktop/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.71.0";
version = "2.71.1";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-boZ28o8bg2TXZcc1mx4ZlPIPRFK9wy4+MTbYLT5XCQU=";
hash = "sha256-+1i4ycURuT0xSF2yLQM5uyDFzeeGQ8H4On2Pb3oIRYc=";
};
appimageContents = appimageTools.extractType2 {
pkgs/applications/file-managers/ytree/default.nix
-40
View File
@@ -1,40 +0,0 @@
{ lib, stdenv
, fetchurl
, ncurses
, readline
}:
stdenv.mkDerivation rec {
pname = "ytree";
version = "2.05";
src = fetchurl {
url = "https://han.de/~werner/${pname}-${version}.tar.gz";
sha256 = "sha256-jPixUeSRO1t/epHf/VxzBhBqQkd+xE5x1ix19mq2Glc=";
};
buildInputs = [
ncurses
readline
];
# don't save timestamp, in order to improve reproducibility
postPatch = ''
substituteInPlace Makefile --replace 'gzip' 'gzip -n'
'';
installFlags = [ "DESTDIR=${placeholder "out"}" ];
preInstall = ''
mkdir -p $out/bin $out/share/man/man1
'';
meta = with lib; {
description = "A curses-based file manager similar to DOS Xtree(TM)";
homepage = "https://www.han.de/~werner/ytree.html";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}
# TODO: X11 support
pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch
-93
View File
@@ -1,93 +0,0 @@
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
index 189737908..a2a479693 100644
--- a/plug-ins/pdf/pdf-import.cpp
+++ b/plug-ins/pdf/pdf-import.cpp
@@ -152,12 +152,12 @@ public :
void
updateLineDash (GfxState *state)
{
- double *dashPattern;
- int dashLength;
- double dashStart;
-
- state->getLineDash (&dashPattern, &dashLength, &dashStart);
- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0;
+ const double *dashPattern=NULL;
+ int dashLength=0;
+ double dashStart=0;
+ const std::vector<double> &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ...
+ dashPattern = dash.data();
+ dashLength = dash.size();
if (dashLength == 0)
this->line_style = DIA_LINE_STYLE_SOLID;
@@ -318,10 +318,11 @@ public :
//FIXME: Dia is really unhappy about zero size fonts
if (!(state->getFontSize() > 0.0))
return;
- GfxFont *f = state->getFont();
+ const std::shared_ptr<GfxFont> f = state->getFont(); // poppler 22.05 ... header changed
+ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer;
// instead of building the same font over and over again
- if (g_hash_table_lookup (this->font_map, f)) {
+ if (g_hash_table_lookup (this->font_map, f1)) {
++font_map_hits;
return;
}
@@ -333,8 +334,9 @@ public :
gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans");
// we are (not anymore) building the same font over and over again
+ f1 = &f;
g_print ("Font 0x%x: '%s' size=%g (* %g)\n",
- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale);
+ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale);
// now try to make a fontname Dia/Pango can cope with
// strip style postfix - we already have extracted the style bits above
@@ -354,7 +356,9 @@ public :
fsize *= fabs(fm[3] / fm[0]);
font = dia_font_new (family, style, fsize * scale / 0.8);
- g_hash_table_insert (this->font_map, f, font);
+ f1 = &f;
+ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer;
+ g_hash_table_insert (this->font_map, f2, font);
g_free (family);
}
void updateTextShift(GfxState *state, double shift)
@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s)
return;
if (!(state->getFontSize() > 0.0))
return;
- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont());
+ gconstpointer f_1 = &state->getFont();
+ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1);
// we have to decode the string data first
{
- GfxFont *f = state->getFont();
+ const std::shared_ptr<GfxFont> f = state->getFont();
const char *p = s->c_str();
CharCode code;
int j = 0, m, n;
@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
std::unique_ptr<PDFDoc> doc;
GooString *fileName = new GooString(filename);
// no passwords yet
- GooString *ownerPW = NULL;
- GooString *userPW = NULL;
+ const std::optional<GooString> ownerPW;
+ const std::optional<GooString> userPW;
gboolean ret = FALSE;
// without this we will get strange crashes (at least with /O2 build)
@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
delete diaOut;
ret = TRUE;
}
+ doc.reset();
delete fileName;
return ret;
pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch
-200
View File
@@ -1,200 +0,0 @@
ls diff --git focusblur-3.2.6/src/aaa.h focusblur-3.2.6/src/aaa.h
index 4a6d90b..c74cab2 100644
--- focusblur-3.2.6/src/aaa.h
+++ focusblur-3.2.6/src/aaa.h
@@ -19,8 +19,7 @@
#ifndef __AAA_H__
#define __AAA_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/brush.h focusblur-3.2.6/src/brush.h
index 685b253..8778fec 100644
--- focusblur-3.2.6/src/brush.h
+++ focusblur-3.2.6/src/brush.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_BRUSH_H__
#define __FOCUSBLUR_BRUSH_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/depthmap.h focusblur-3.2.6/src/depthmap.h
index 78f5e99..baee540 100644
--- focusblur-3.2.6/src/depthmap.h
+++ focusblur-3.2.6/src/depthmap.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_DEPTHMAP_H__
#define __FOCUSBLUR_DEPTHMAP_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
#include "focusblurenums.h"
diff --git focusblur-3.2.6/src/diffusion.h focusblur-3.2.6/src/diffusion.h
index 07ffe4b..3c1e4b9 100644
--- focusblur-3.2.6/src/diffusion.h
+++ focusblur-3.2.6/src/diffusion.h
@@ -23,7 +23,7 @@
#define __FOCUSBLUR_DIFFUSION_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblur.h"
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/fftblur.h focusblur-3.2.6/src/fftblur.h
index 124bcba..cd809fa 100644
--- focusblur-3.2.6/src/fftblur.h
+++ focusblur-3.2.6/src/fftblur.h
@@ -23,8 +23,7 @@
#define __FOCUSBLUR_FFTBLUR_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <libgimpwidgets/gimpwidgetstypes.h>
#include "focusblurparam.h"
diff --git focusblur-3.2.6/src/fftblurbuffer.h focusblur-3.2.6/src/fftblurbuffer.h
index b34d682..42e6380 100644
--- focusblur-3.2.6/src/fftblurbuffer.h
+++ focusblur-3.2.6/src/fftblurbuffer.h
@@ -28,8 +28,7 @@
#endif
#include <fftw3.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtkstyle.h>
#include <libgimp/gimptypes.h>
#include <libgimpwidgets/gimpwidgetstypes.h>
diff --git focusblur-3.2.6/src/fftblurproc.h focusblur-3.2.6/src/fftblurproc.h
index 495572d..10a34f4 100644
--- focusblur-3.2.6/src/fftblurproc.h
+++ focusblur-3.2.6/src/fftblurproc.h
@@ -23,8 +23,7 @@
#define __FOCUSBLUR_FFTBLUR_PROC_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/focusblur.h focusblur-3.2.6/src/focusblur.h
index 54ca40a..d7e13a6 100644
--- focusblur-3.2.6/src/focusblur.h
+++ focusblur-3.2.6/src/focusblur.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_H__
#define __FOCUSBLUR_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/focusblurparam.h focusblur-3.2.6/src/focusblurparam.h
index 64c887b..32865b4 100644
--- focusblur-3.2.6/src/focusblurparam.h
+++ focusblur-3.2.6/src/focusblurparam.h
@@ -22,8 +22,7 @@
#ifndef __FOCUSBLUR_PARAM_H__
#define __FOCUSBLUR_PARAM_H__
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <gtk/gtkstyle.h>
#include <libgimp/gimptypes.h>
diff --git focusblur-3.2.6/src/focusblurstock.h focusblur-3.2.6/src/focusblurstock.h
index 15f3603..cfc0567 100644
--- focusblur-3.2.6/src/focusblurstock.h
+++ focusblur-3.2.6/src/focusblurstock.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_STOCK_H__
#define __FOCUSBLUR_STOCK_H__
-#include <glib/gtypes.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/focusblurtypes.h focusblur-3.2.6/src/focusblurtypes.h
index 0954c60..1531c84 100644
--- focusblur-3.2.6/src/focusblurtypes.h
+++ focusblur-3.2.6/src/focusblurtypes.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_TYPES_H__
#define __FOCUSBLUR_TYPES_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff --git focusblur-3.2.6/src/interface.h focusblur-3.2.6/src/interface.h
index 6defd27..e819c60 100644
--- focusblur-3.2.6/src/interface.h
+++ focusblur-3.2.6/src/interface.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_INTERFACE_H__
#define __FOCUSBLUR_INTERFACE_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/render.h focusblur-3.2.6/src/render.h
index febbd24..a501f1e 100644
--- focusblur-3.2.6/src/render.h
+++ focusblur-3.2.6/src/render.h
@@ -24,7 +24,7 @@
#include "config.h"
-#include <glib/gtypes.h>
+#include <glib.h>
//#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
diff --git focusblur-3.2.6/src/shine.h focusblur-3.2.6/src/shine.h
index c5a3621..86b4c09 100644
--- focusblur-3.2.6/src/shine.h
+++ focusblur-3.2.6/src/shine.h
@@ -22,7 +22,7 @@
#ifndef __FOCUSBLUR_SHINE_H__
#define __FOCUSBLUR_SHINE_H__
-#include <glib/gtypes.h>
+#include <glib.h>
#include <libgimp/gimptypes.h>
#include "focusblurtypes.h"
diff --git focusblur-3.2.6/src/source.h focusblur-3.2.6/src/source.h
index 50d34ca..8eec35c 100644
--- focusblur-3.2.6/src/source.h
+++ focusblur-3.2.6/src/source.h
@@ -24,7 +24,7 @@
#include "config.h"
-#include <glib/gtypes.h>
+#include <glib.h>
#include <libgimp/gimptypes.h>
#include "focusblurtypes.h"
pkgs/applications/graphics/qimgv/default.nix
+4
View File
@@ -29,6 +29,10 @@ mkDerivation rec {
pkg-config
];
cmakeFlags = [
"-DVIDEO_SUPPORT=ON"
];
buildInputs = [
exiv2
mpv
pkgs/applications/misc/1password-gui/default.nix
+5 -5
View File
@@ -9,7 +9,7 @@
let
pname = "1password";
version = if channel == "stable" then "8.10.20" else "8.10.20-1.BETA";
version = if channel == "stable" then "8.10.20" else "8.10.22-21.BETA";
sources = {
stable = {
@@ -33,19 +33,19 @@ let
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-+wHxtlE0zeVEObzdpcIP75LKbbjsG8LMqdIPFkY0BoU=";
hash = "sha256-R4jj5U2a8AoAs1qVIjMQx6odK0Ks4WeqRURf3pOOduo=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-BRsp/hhBwgQFU+5Tt1M9V5Lx8oRLN3uaqLrzrPo/xpo=";
hash = "sha256-1opo/RZ0aTZn3Jo9XIw/g8WYK2xgRiaRKgd7RstGJ5g=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-WVP5a007cU1GR/lnL7C6QiJpTTsjzaiS69H2LJzYm70=";
hash = "sha256-jlQgXlLLUF78g2B7KYgTSQZAEe57TRw4vN7MPn3IwwI=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-BBSUSSnot1ktC0ik7yMhqsgLdkeQBrJUpHBvwu0w9m0=";
hash = "sha256-nzKESK3QKsi0Xzm3ytXWIH08LV2F6jLKvCLDHzVR9xQ=";
};
};
};
pkgs/applications/misc/cura/numpy-cast.patch
-12
View File
@@ -1,12 +0,0 @@
diff -urN Cura-15.04.old/Cura/util/sliceEngine.py Cura-15.04/Cura/util/sliceEngine.py
--- Cura-15.04.old/Cura/util/sliceEngine.py 2016-05-07 20:34:17.305020334 +0200
+++ Cura-15.04/Cura/util/sliceEngine.py 2016-05-07 20:40:02.993286467 +0200
@@ -343,7 +343,7 @@
objMax[1] = max(oMax[1], objMax[1])
if objMin is None:
return
- pos += (objMin + objMax) / 2.0 * 1000
+ pos = numpy.add( pos, (objMin + objMax) / 2.0 * 1000, out=pos, casting='unsafe')
commandList += ['-s', 'posx=%d' % int(pos[0]), '-s', 'posy=%d' % int(pos[1])]
vertexTotal = [0] * 4
pkgs/applications/misc/houdini/default.nix
+4 -2
View File
@@ -71,6 +71,8 @@ buildFHSEnv rec {
"bin/hotl" # hda/otl manipulation tool
"bin/hython" # hython
"bin/hkey" # license administration
"bin/husk" # hydra rendereing tool
"bin/mantra" # mantra renderer
"houdini/sbin/sesinetd"
];
in ''
@@ -80,7 +82,7 @@ buildFHSEnv rec {
mkdir -p $out/$(dirname $executable)
echo "#!${stdenv.shell}" >> $out/$executable
echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable
echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable
done
cd $out
@@ -93,6 +95,6 @@ buildFHSEnv rec {
];
runScript = writeScript "${name}-wrapper" ''
exec $@
exec "$@"
'';
}
pkgs/applications/misc/houdini/runtime-build.nix
+35
View File
@@ -0,0 +1,35 @@
{ lib, stdenv, requireFile, bc, version, src, eulaDate }:
let
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
inherit version src;
pname = "houdini-runtime";
buildInputs = [ bc ];
installPhase = ''
patchShebangs houdini.install
mkdir -p $out
./houdini.install --install-houdini \
--install-license \
--no-install-menus \
--no-install-bin-symlink \
--auto-install \
--no-root-check \
--accept-EULA ${eulaDate} \
$out
echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it
'';
dontFixup = true;
meta = with lib; {
description = "3D animation application software";
homepage = "https://www.sidefx.com";
license = licenses.unfree;
platforms = platforms.linux;
hydraPlatforms = [ ]; # requireFile src's should be excluded
maintainers = with maintainers; [ canndrew kwohlfahrt ];
};
}
pkgs/applications/misc/houdini/runtime.nix
+4 -30
View File
@@ -1,40 +1,14 @@
{ lib, stdenv, requireFile, bc }:
{ lib, stdenv, requireFile, callPackage}:
let
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
callPackage ./runtime-build.nix rec {
version = "19.5.569";
pname = "houdini-runtime";
eulaDate = "2021-10-13";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz";
sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e";
url = meta.homepage;
};
buildInputs = [ bc ];
installPhase = ''
patchShebangs houdini.install
mkdir -p $out
./houdini.install --install-houdini \
--install-license \
--no-install-menus \
--no-install-bin-symlink \
--auto-install \
--no-root-check \
--accept-EULA 2021-10-13 \
$out
echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it
'';
dontFixup = true;
meta = with lib; {
description = "3D animation application software";
homepage = "https://www.sidefx.com";
license = licenses.unfree;
platforms = platforms.linux;
hydraPlatforms = [ ]; # requireFile src's should be excluded
maintainers = with maintainers; [ canndrew kwohlfahrt ];
url = "https://www.sidefx.com/download/daily-builds/?production=true";
};
}
pkgs/applications/misc/josm/default.nix
+4 -4
View File
@@ -3,20 +3,20 @@
}:
let
pname = "josm";
version = "18822";
version = "18906";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-pzB12lkcWGJ7sVdcfJZC2MnUowfWdElxny0pSQ5vjlw=";
hash = "sha256-/G3/v7pkRYqxvhYRthmU/20U8cYUkwZ+/VJXvpzeRPE=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-MFiWbEU8C6Jvq9wkIKANQeqJh2/yC3y40ANnGEl4IF0=";
hash = "sha256-+CDnAQK4ekFCoWvd8+kQLNqycD7tIQ/D7VAyrDU030A=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version;
sha256 = "sha256-/zdOaiyuvSwdVZcnw0ghDj2I+YKpFLc12fjZUMtRtVg=";
sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo=";
};
};
in
pkgs/applications/misc/navi/default.nix
+1
View File
@@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/denisidoro/navi";
license = licenses.asl20;
platforms = platforms.unix;
mainProgram = "navi";
maintainers = with maintainers; [ cust0dian ];
};
}
pkgs/applications/misc/notejot/default.nix
+10
View File
@@ -12,6 +12,7 @@
, pkg-config
, vala
, wrapGAppsHook4
, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -41,6 +42,15 @@ stdenv.mkDerivation rec {
libgee
];
patches = [
# Fixes the compilation error with new Vala compiler. Remove in the next version.
(fetchpatch {
url = "https://github.com/musicinmybrain/notejot/commit/c6a7cfcb792de63fb51eb174f9f3d4e02f6a2ce1.patch";
hash = "sha256-dexPKIpUaAu/p0K2WQpElhPNt86CS+jD0dPL5+CTl4I=";
})
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
pkgs/applications/misc/safeeyes/default.nix
+5 -3
View File
@@ -25,6 +25,10 @@ buildPythonApplication rec {
hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM=";
};
postPatch = ''
substituteInPlace setup.py --replace "root_dir = sys.prefix" "root_dir = '/'"
'';
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection
@@ -49,9 +53,7 @@ buildPythonApplication rec {
dontWrapGApps = true;
postInstall = ''
mkdir -p $out/share/applications
cp -r safeeyes/platform/icons $out/share/icons/
cp safeeyes/platform/io.github.slgobinath.SafeEyes.desktop $out/share/applications/io.github.slgobinath.SafeEyes.desktop
mv $out/lib/python*/site-packages/share $out/share
'';
preFixup = ''
pkgs/applications/misc/tellico/hex.patch
-15
View File
@@ -1,15 +0,0 @@
index 7ea81c7..0c19767 100644
--- a/src/utils/iso5426converter.cpp
+++ b/src/utils/iso5426converter.cpp
@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) {
return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW
default:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ myDebug() << "no match for" << hex << c;
+#else
myDebug() << "no match for" << Qt::hex << c;
+#endif
return QChar();
}
}
pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch
-55
View File
@@ -1,55 +0,0 @@
From 86cc27022015697a61d1ec1b13e52f9dbe7f6c57 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Mar 2020 18:34:00 -0400
Subject: [PATCH] Adjust get_data_path for NixOS
We construct the ulauncher data path from xdg_data_dirs
and prevent it from being a nix store path or being xdg_data_home.
We do this to prevent /nix/store paths being hardcoded to shortcuts.json.
On NixOS this path will either be /run/current-system/sw/share/ulauncher
or $HOME/.nix-profile/share/ulauncher if the user used nix-env.
---
ulauncher/config.py | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/ulauncher/config.py b/ulauncher/config.py
index f21014e..cc636e1 100644
--- a/ulauncher/config.py
+++ b/ulauncher/config.py
@@ -50,15 +50,24 @@ def get_data_path():
is specified at installation time.
"""
- # Get pathname absolute or relative.
- path = os.path.join(
- os.path.dirname(__file__), __ulauncher_data_directory__)
-
- abs_data_path = os.path.abspath(path)
- if not os.path.exists(abs_data_path):
- raise ProjectPathNotFoundError(abs_data_path)
-
- return abs_data_path
+ paths = list(
+ filter(
+ os.path.exists,
+ [
+ os.path.join(dir, "ulauncher")
+ for dir in xdg_data_dirs
+ # Get path that isn't in the /nix/store so they don't get hardcoded into configs
+ if not dir.startswith("/nix/store/")
+ # Exclude .local/share/ulauncher which isn't what we want
+ if not dir.startswith(xdg_data_home)
+ ],
+ )
+ )
+
+ try:
+ return paths[0]
+ except:
+ raise ProjectPathNotFoundError()
def is_wayland():
--
2.25.1
pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch
+43
View File
@@ -0,0 +1,43 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index de1cd6e..bb5700b 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -616,24 +616,6 @@ config("compiler") {
}
}
- # TODO(crbug.com/1488374): This causes binary size growth and potentially
- # other problems.
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
- if (default_toolchain != "//build/toolchain/cros:target" &&
- !llvm_android_mainline) {
- cflags += [
- "-mllvm",
- "-split-threshold-for-reg-with-hint=0",
- ]
- if (use_thin_lto && is_a_target_toolchain) {
- if (is_win) {
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
- } else {
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
- }
- }
- }
-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
@@ -800,13 +782,6 @@ config("compiler") {
if (is_apple) {
ldflags += [ "-Wcrl,object_path_lto" ]
}
- if (!is_chromeos) {
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
- # toolchain has this flag.
- # We only use one version of LLVM within a build so there's no need to
- # upgrade debug info, which can be expensive since it runs the verifier.
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
- }
}
# TODO(https://crbug.com/1211155): investigate why this isn't effective on
pkgs/applications/networking/browsers/chromium/common.nix
+4
View File
@@ -246,6 +246,7 @@ let
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
./patches/angle-wayland-include-protocol.patch
] ++ lib.optionals (!chromiumVersionAtLeast "120") [
# We need to revert this patch to build M114+ with LLVM 16:
(githubPatch {
# Reland [clang] Disable autoupgrading debug info in ThinLTO builds
@@ -253,6 +254,9 @@ let
hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";
revert = true;
})
] ++ lib.optionals (chromiumVersionAtLeast "120") [
# We need to revert this patch to build M120+ with LLVM 16:
./chromium-120-llvm-16.patch
] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [
# Fix build with at-spi2-core ≥ 2.49
# This version is still needed for electron.
pkgs/applications/networking/browsers/chromium/default.nix
-1
View File
@@ -1,6 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, buildPackages
, llvmPackages_16
, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
pkgs/applications/networking/instant-messengers/gotktrix/default.nix
-50
View File
@@ -1,50 +0,0 @@
{ lib
, buildGoModule
, fetchFromGitHub
, gtk4
, glib
, gobject-introspection
, pkg-config
}:
buildGoModule rec {
pname = "gotktrix";
version = "unstable-2023-04-05";
src = fetchFromGitHub {
owner = "diamondburned";
repo = pname;
rev = "a8f876a383cc34dac18edddbe22be2dd494b8d0c"; # compound
hash = "sha256-BuiA9UajdMhSrEfaXdu5DZlVhC4GVUdUpQDLMvKGrEk=";
};
vendorHash = "sha256-oo/j6i7slXILqyvj/EHojsyCZzJMGd10PTZaLvI1xoc=";
buildInputs = [
gtk4
glib
];
nativeBuildInputs = [ pkg-config gobject-introspection ];
# Checking requires a working display
doCheck = false;
postPatch = ''
sed -i '/DBusActivatable/d' .nix/com.github.diamondburned.gotktrix.desktop
echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop
'';
postInstall = ''
install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/
install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png
'';
meta = with lib; {
description = "Matrix client written in Go using GTK4";
homepage = "https://github.com/diamondburned/gotktrix";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
};
}
pkgs/applications/networking/remote/remmina/default.nix
+2
View File
@@ -6,6 +6,7 @@
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz
, wayland
# The themes here are soft dependencies; only icons are missing without them.
, gnome
, withKf5Wallet ? stdenv.isLinux, libsForQt5
@@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium
harfbuzz python3
wayland
] ++ lib.optionals stdenv.isLinux [ libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ]
++ lib.optionals withLibsecret [ libsecret ]
++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ]
pkgs/applications/office/calligra/qt5_11.patch
-98
View File
@@ -1,98 +0,0 @@
diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
index 0ffdcf6..cdca006 100644
--- a/libs/widgets/KoCsvImportDialog.cpp
+++ b/libs/widgets/KoCsvImportDialog.cpp
@@ -21,6 +21,7 @@
#include "KoCsvImportDialog.h"
// Qt
+#include <QButtonGroup>
#include <QTextCodec>
#include <QTextStream>
diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
index f91555c..a3816f9 100644
--- a/libs/widgets/KoPageLayoutWidget.cpp
+++ b/libs/widgets/KoPageLayoutWidget.cpp
@@ -23,6 +23,8 @@
#include <KoUnit.h>
+#include <QButtonGroup>
+
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
{
public:
diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
index c0d5136..d2a772e 100644
--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
@@ -24,6 +24,7 @@
// Qt
#include <QAbstractItemModel>
+#include <QAction>
// Calligra
#include <KoIcon.h>
diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
index ed10919..8f52177 100644
--- a/plugins/formulashape/FormulaToolWidget.cpp
+++ b/plugins/formulashape/FormulaToolWidget.cpp
@@ -30,6 +30,7 @@
#include <QWidgetAction>
#include <QTableWidget>
#include <QAction>
+#include <QHeaderView>
#include <QMenu>
FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
index a0a9832..7d7db53 100644
--- a/sheets/dialogs/LayoutDialog.cpp
+++ b/sheets/dialogs/LayoutDialog.cpp
@@ -36,6 +36,7 @@
#include <math.h>
#include <QIntValidator>
+#include <QButtonGroup>
#include <QCheckBox>
#include <QFrame>
#include <QLabel>
diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
index d64208c..bfddb3a 100644
--- a/words/part/dialogs/KWAnchoringProperties.cpp
+++ b/words/part/dialogs/KWAnchoringProperties.cpp
@@ -35,6 +35,7 @@
#include <kundo2command.h>
+#include <QButtonGroup>
#include <QComboBox>
const int KWAnchoringProperties::vertRels[4][20] = {
diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
index e38599a..7e8b2d5 100644
--- a/words/part/dialogs/KWRunAroundProperties.cpp
+++ b/words/part/dialogs/KWRunAroundProperties.cpp
@@ -28,6 +28,8 @@
#include <kundo2command.h>
+#include <QButtonGroup>
+
KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
: m_state(state)
{
diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
index ae743da..3007f91 100644
--- a/stage/part/KPrPresentationTool.cpp
+++ b/stage/part/KPrPresentationTool.cpp
@@ -32,6 +32,7 @@
#include <QDesktopServices>
#include <QUrl>
#include <QDBusConnection>
+#include <QFrame>
#include <KoShape.h>
#include <KoShapeManager.h>
pkgs/applications/office/paperless-ngx/default.nix
+5 -8
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, buildNpmPackage
, nixosTests
, gettext
@@ -224,16 +223,18 @@ python.pkgs.buildPythonApplication rec {
${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages
'';
installPhase = ''
installPhase = let
pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
in ''
mkdir -p $out/lib/paperless-ngx
cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx
ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/
chmod +x $out/lib/paperless-ngx/src/manage.py
makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "${pythonPath}" \
--prefix PATH : "${path}"
makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \
--prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src" \
--prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \
--prefix PATH : "${path}"
'';
@@ -271,10 +272,6 @@ python.pkgs.buildPythonApplication rec {
# Disable unneeded code coverage test
substituteInPlace src/setup.cfg \
--replace "--cov --cov-report=html --cov-report=xml" ""
# OCR on NixOS recognizes the space in the picture, upstream CI doesn't.
# See https://github.com/paperless-ngx/paperless-ngx/pull/2216
substituteInPlace src/paperless_tesseract/tests/test_parser.py \
--replace "this is awebp document" "this is a webp document"
'';
disabledTests = [
pkgs/applications/radio/abracadabra/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "abracadabra";
version = "2.2.4";
version = "2.3.1";
src = fetchFromGitHub {
owner = "KejPi";
repo = "AbracaDABra";
rev = "v${version}";
sha256 = "sha256-gpZ6ckV//fhDlpAqmMwL4XNXX7xFmGi58fkOC4oRcDM=";
hash = "sha256-HRwgtNCrEzo6uXNJHG3PwpBAXVTppYUTmiwKWi3reho=";
};
nativeBuildInputs = [
pkgs/applications/radio/rtl_433/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
version = "22.11";
version = "23.11";
pname = "rtl_433";
src = fetchFromGitHub {
owner = "merbanan";
repo = "rtl_433";
rev = version;
sha256 = "sha256-qDY+prdf8O/dqmAgLU6lpsNIvL1R5V2AwsB+4CpOqGM=";
hash = "sha256-qCfPweJeYHIuM1DfDmeDilkV/RLzbzlIe1sIpSx/EYc=";
};
nativeBuildInputs = [ pkg-config cmake ];
pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch
-31
View File
@@ -1,31 +0,0 @@
diff --git a/shapely/geos.py b/shapely/geos.py
index 88c5f53..1ccd6e4 100644
--- a/shapely/geos.py
+++ b/shapely/geos.py
@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'):
alt_paths = [
'libgeos_c.so.1',
'libgeos_c.so',
+ '@libgeos_c@',
]
_lgeos = load_dll('geos_c', fallbacks=alt_paths)
@@ -160,6 +161,7 @@ elif sys.platform == 'darwin':
"/usr/local/lib/libgeos_c.dylib",
# homebrew Apple Silicon
"/opt/homebrew/lib/libgeos_c.dylib",
+ "@libgeos_c@",
]
_lgeos = load_dll('geos_c', fallbacks=alt_paths)
diff --git a/tests/test_dlls.py b/tests/test_dlls.py
index c71da8e..c36262c 100644
--- a/tests/test_dlls.py
+++ b/tests/test_dlls.py
@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase):
'/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS)
os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux)
'libgeos_c.so.1',
- 'libgeos_c.so'])
+ 'libgeos_c.so',
+ '@libgeos_c@'])
pkgs/applications/science/math/yacas/fix-test-script.patch
-26
View File
@@ -1,26 +0,0 @@
diff --git i/tests/test-yacas w/tests/test-yacas
index b375d78b..0e3a616b 100755
--- i/tests/test-yacas
+++ w/tests/test-yacas
@@ -35,9 +35,9 @@ FAILED_TESTS="" # list of failed tests
FAILURES=0 # number of failed tests
TOTALTESTS=0 # total number of tests
-TESTFILE=/tmp/test-yacas.$$
-TIMEFILE=/tmp/time-yacas.$$
-VERSIONF=/tmp/version-yacas-$$.ys
+TESTFILE="$(mktemp -t test-yacas.XXX)"
+TIMEFILE="$(mktemp -t time-yacas.XXX)"
+VERSIONF="$(mktemp -t version-yacas-XXX.ys)"
LOGFILE=yacas-logfile.txt
echo "Print(Version());" > $VERSIONF
VERSION=`$CMD $VERSIONF`
@@ -69,7 +69,7 @@ for scr in $SCRIPTS; do
# fi
echo "Running $scr"
if [ -f $TESTFILE ]; then rm $TESTFILE ; fi
- /bin/bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
+ bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \
2> $TIMEFILE \
|| (echo "Error -- User interrupt" > $TESTFILE)
# cat $TIMEFILE
pkgs/applications/system/glances/skip-failing-tests.patch
-52
View File
@@ -1,52 +0,0 @@
diff --git a/unitest.py b/unitest.py
--- a/unitest.py
+++ b/unitest.py
@@ -59,6 +59,7 @@ class TestGlances(unittest.TestCase):
"""The function is called *every time* before test_*."""
print('\n' + '=' * 78)
+ @unittest.skip("Requires access to /etc/mtab")
def test_000_update(self):
"""Update stats (mandatory step for all the stats).
@@ -87,6 +88,7 @@ class TestGlances(unittest.TestCase):
for plugin in plugins_to_check:
self.assertTrue(plugin in plugins_list)
+ @unittest.skip("Fails on NixOS")
def test_002_system(self):
"""Check SYSTEM plugin."""
stats_to_check = ['hostname', 'os_name']
@@ -97,6 +99,7 @@ class TestGlances(unittest.TestCase):
self.assertTrue(stat in stats_grab, msg='Cannot find key: %s' % stat)
print('INFO: SYSTEM stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS")
def test_003_cpu(self):
"""Check CPU plugin."""
stats_to_check = ['system', 'user', 'idle']
@@ -110,7 +113,7 @@ class TestGlances(unittest.TestCase):
self.assertLessEqual(stats_grab[stat], 100)
print('INFO: CPU stats: %s' % stats_grab)
- @unittest.skipIf(WINDOWS, "Load average not available on Windows")
+ @unittest.skip("Fails on NixOS")
def test_004_load(self):
"""Check LOAD plugin."""
stats_to_check = ['cpucore', 'min1', 'min5', 'min15']
@@ -123,6 +126,7 @@ class TestGlances(unittest.TestCase):
self.assertGreaterEqual(stats_grab[stat], 0)
print('INFO: LOAD stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS")
def test_005_mem(self):
"""Check MEM plugin."""
stats_to_check = ['available', 'used', 'free', 'total']
@@ -135,6 +139,7 @@ class TestGlances(unittest.TestCase):
self.assertGreaterEqual(stats_grab[stat], 0)
print('INFO: MEM stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS")
def test_006_swap(self):
"""Check MEMSWAP plugin."""
stats_to_check = ['used', 'free', 'total']
pkgs/applications/version-management/radicle-upstream/default.nix
+1
View File
@@ -76,6 +76,7 @@ let
license = licenses.gpl3Plus;
maintainers = with maintainers; [ d-xo ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
in
if stdenv.isDarwin
pkgs/applications/video/haruna/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, breeze-qt5
, cmake
, extra-cmake-modules
, ffmpeg-full
, ffmpeg-headless
, kconfig
, kcoreaddons
, kfilemetadata
@@ -47,7 +47,7 @@ mkDerivation rec {
qqc2-desktop-style
yt-dlp
ffmpeg-full
ffmpeg-headless
kconfig
kcoreaddons
kfilemetadata
pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+2 -2
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "obs-vkcapture";
version = "1.4.5";
version = "1.4.7";
src = fetchFromGitHub {
owner = "nowrep";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-C5dMDfCFkUNENA4qQlmGeavKqYpbRHkUz79LVM5aVao=";
hash = "sha256-/EbavDDeFQys9zu3FAgsAeVVbs1Rrv8YR4949XCHc6s=";
};
cmakeFlags = lib.optionals stdenv.isi686 [
pkgs/applications/video/olive-editor/q-painter-path.patch
-48
View File
@@ -1,48 +0,0 @@
diff --git a/effects/internal/texteffect.cpp b/effects/internal/texteffect.cpp
index 279f406d9..7fe9e8e72 100644
--- a/effects/internal/texteffect.cpp
+++ b/effects/internal/texteffect.cpp
@@ -20,6 +20,7 @@
#include "texteffect.h"
+#include <QPainterPath>
#include <QGridLayout>
#include <QLabel>
#include <QOpenGLTexture>
diff --git a/effects/internal/timecodeeffect.cpp b/effects/internal/timecodeeffect.cpp
index 4de3e3497..fd0fa6224 100644
--- a/effects/internal/timecodeeffect.cpp
+++ b/effects/internal/timecodeeffect.cpp
@@ -20,6 +20,7 @@
#include "timecodeeffect.h"
+#include <QPainterPath>
#include <QGridLayout>
#include <QLabel>
#include <QOpenGLTexture>
diff --git a/ui/graphview.cpp b/ui/graphview.cpp
index 3e13075cd..c441133a8 100644
--- a/ui/graphview.cpp
+++ b/ui/graphview.cpp
@@ -20,6 +20,7 @@
#include "graphview.h"
+#include <QPainterPath>
#include <QPainter>
#include <QMouseEvent>
#include <QtMath>
diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp
index f39065b4f..aa7fd638d 100644
--- a/ui/timelineheader.cpp
+++ b/ui/timelineheader.cpp
@@ -20,6 +20,7 @@
#include "timelineheader.h"
+#include <QPainterPath>
#include <QPainter>
#include <QMouseEvent>
#include <QScrollBar>
pkgs/applications/video/openshot-qt/default.nix
+19 -14
View File
@@ -2,7 +2,6 @@
, stdenv
, mkDerivationWith
, fetchFromGitHub
, fetchpatch
, doxygen
, gtk3
, libopenshot
@@ -12,16 +11,20 @@
, wrapGAppsHook
}:
mkDerivationWith python3.pkgs.buildPythonApplication rec {
let
pname = "openshot-qt";
version = "3.0.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as=";
hash = "sha256-kEz1APBitWLlnIbyloYMsqNrwC9RqU04kyyWzm5klYc=";
};
in
mkDerivationWith python3.pkgs.buildPythonApplication {
inherit pname version src;
outputs = [ "out" ]; # "lib" can't be split
nativeBuildInputs = [
doxygen
@@ -41,8 +44,10 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec {
sip_4
];
strictDeps = true;
preConfigure = ''
# tries to create caching directories during install
# the builder tries to create caching directories during install
export HOME=$(mktemp -d)
'';
@@ -67,19 +72,19 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec {
inherit (libopenshot) libopenshot-audio;
};
meta = with lib; {
meta = {
homepage = "http://openshot.org/";
description = "Free, open-source video editor";
longDescription = ''
OpenShot Video Editor is a free, open-source video editor for Linux.
OpenShot can take your videos, photos, and music files and help you
create the film you have always dreamed of. Easily add sub-titles,
transitions, and effects, and then export your film to DVD, YouTube,
Vimeo, Xbox 360, and many other common formats.
OpenShot can take your videos, photos, and music files and help you create
the film you have always dreamed of. Easily add sub-titles, transitions,
and effects, and then export your film to DVD, YouTube, Vimeo, Xbox 360,
and many other common formats.
'';
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
license = with lib.licenses; [ gpl3Plus ];
mainProgram = "openshot-qt";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
}
pkgs/applications/virtualization/docker/compose.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.23.1";
version = "2.23.3";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-g8XaMvKt3tR7a7kq+n4ueDXx9iWuAu02ONb73W23ZGY=";
hash = "sha256-Rp13xK7pRyjHaDclAfL+yzNf4ppOy9S+XFbydj4TDL4=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-BeW39XN1CvPCCq4otX+Il2dGGcjGrTMzc4iSXmQZFmw=";
vendorHash = "sha256-iKBMd4e1oVNdKuk08tYPexQqs9JLofhdf4yEP1s97EQ=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch
-21
View File
@@ -1,21 +0,0 @@
diff --git a/Makefile b/Makefile
index 0070ada..802cef0 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,7 @@ $(BIN_NAME): $(BIN_OBJS)
##### Public rules #####
all: CPPFLAGS += -DNDEBUG
-all: shared static tools
+all: shared tools
# Run with ASAN_OPTIONS="protect_shadow_gap=0" to avoid CUDA OOM errors
debug: CFLAGS += -pedantic -fsanitize=undefined -fno-omit-frame-pointer -fno-common -fsanitize=address
@@ -232,7 +232,6 @@ install: all
# Install header files
$(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir)
# Install library files
- $(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)
$(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir)
$(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK)
$(LDCONFIG) -n $(DESTDIR)$(libdir)
pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
-11
View File
@@ -1,11 +0,0 @@
Index: /trunk/configure
===================================================================
--- a/configure (revision 90360)
+++ b/configure (revision 90377)
@@ -1588,5 +1588,5 @@
if [ $? -eq 0 ]; then
echo "(Qt5 from pkg-config)" >> $LOG
- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
+ FLGQT5=`pkg-config Qt5Core --cflags`
# gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
[ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
pkgs/applications/window-managers/hyprwm/hyprland/portals.patch
-28
View File
@@ -1,28 +0,0 @@
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 1d978aed..56665389 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() {
static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue;
- if (!*PSUPPRESSPORTAL) {
- if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) {
+ static auto* const PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR");
+
+ static auto const PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : "";
+
+ if (!*PSUPPRESSPORTAL && PORTALDIR != "") {
+ if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) {
// bad portal detected
g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.",
CColor(0), 15000, ICON_ERROR);
}
-
- if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) {
- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0),
- 15000, ICON_ERROR);
- }
}
}
pkgs/desktops/arcan/arcan/default.nix → pkgs/by-name/ar/arcan/package.nix
+17 -11
View File
@@ -2,8 +2,9 @@
, stdenv
, fetchFromGitHub
, SDL2
, callPackage
, cmake
, espeak
, espeak-ng
, ffmpeg
, file
, freetype
@@ -54,11 +55,15 @@
let
allSources = {
letoram-arcan-src = fetchFromGitHub {
owner = "letoram";
repo = "arcan";
rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf";
hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls=";
letoram-arcan = {
pname = "arcan";
version = "0.6.2.1-unstable-2023-11-18";
src = fetchFromGitHub {
owner = "letoram";
repo = "arcan";
rev = "0950ee236f96a555729498d0fdf91c16901037f5";
hash = "sha256-TxadRlidy4KRaQ4HunPO6ISJqm6JwnMRM8y6dX6vqJ4=";
};
};
letoram-openal-src = fetchFromGitHub {
owner = "letoram";
@@ -87,10 +92,7 @@ let
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "arcan";
version = "0.6.2.1-unstable-2023-10-14";
src = allSources.letoram-arcan-src;
inherit (allSources.letoram-arcan) pname version src;
nativeBuildInputs = [
cmake
@@ -140,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
xz
]
++ lib.optionals useEspeak [
espeak
espeak-ng
];
# Emulate external/git/clone.sh
@@ -197,6 +199,10 @@ stdenv.mkDerivation (finalAttrs: {
"format"
];
passthru = {
wrapper = callPackage ./wrapper.nix { };
};
meta = {
homepage = "https://arcan-fe.com/";
description = "Combined Display Server, Multimedia Framework, Game Engine";
pkgs/desktops/arcan/wrapper.nix → pkgs/by-name/ar/arcan/wrapper.nix
View File
pkgs/by-name/ar/ark-pixel-font/package.nix
+60
View File
@@ -0,0 +1,60 @@
{ lib
, python3Packages
, fetchFromGitHub
, nix-update-script
, ...
}:
python3Packages.buildPythonPackage rec {
pname = "ark-pixel-font";
version = "2023.08.15";
src = fetchFromGitHub {
owner = "TakWolf";
repo = pname;
rev = version;
hash = "sha256-Qaa3uuMCPrRG0wo2AGU0v+fonY1c/KuQYTGoyvITcio=";
};
format = "other";
nativeBuildInputs = with python3Packages; [
pixel-font-builder
unidata-blocks
character-encoding-utils
pypng
pillow
beautifulsoup4
jinja2
gitpython
];
buildPhase = ''
runHook preBuild
python build.py
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm444 build/outputs/*.bdf -t $out/share/fonts/bdf
install -Dm444 build/outputs/*.otf -t $out/share/fonts/opentype
install -Dm444 build/outputs/*.ttf -t $out/share/fonts/truetype
install -Dm444 build/outputs/*.woff2 -t $out/share/fonts/woff2
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Open source pan-CJK pixel font";
homepage = "https://ark-pixel-font.takwolf.com/";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ h7x4 ];
platforms = lib.platforms.all;
};
}
pkgs/desktops/arcan/cat9/default.nix → pkgs/by-name/ca/cat9/package.nix
+7 -7
View File
@@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cat9";
version = "unstable-2023-06-25";
version = "unstable-2023-11-06";
src = fetchFromGitHub {
owner = "letoram";
repo = "cat9";
rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05";
hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc=";
rev = "a807776a85237ab0bdd0a712fb33c176fc295e30";
hash = "sha256-OlH8FgVBk76Qw+5mnsrryXOL9GbPJWlwUGtYlLuAPxQ=";
};
dontConfigure = true;
@@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "https://github.com/letoram/cat9";
description = "A User shell for LASH";
license = licenses.unlicense;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
license = with lib.licenses; [ unlicense ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/co/cowsql/package.nix
+1 -1
View File
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Embeddable, replicated and fault tolerant SQL engine";
homepage = "https://github.com/cowsql/cowsql";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ adamcstephens ];
maintainers = teams.lxc.members;
platforms = platforms.unix;
};
})
pkgs/desktops/arcan/durden/default.nix → pkgs/by-name/du/durden/package.nix
+7 -7
View File
@@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "durden";
version = "unstable-2023-08-11";
version = "unstable-2023-10-23";
src = fetchFromGitHub {
owner = "letoram";
repo = "durden";
rev = "728d7fc3292cc162b1cea505c8a71512b2e84925";
hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w=";
rev = "347dba6da011bbaa70c6edaf82a2d915f4057db3";
hash = "sha256-iNf7fOzz7mf1CXG5leCenkSTrdCc9/KL8VLw8gUIyKE=";
};
dontConfigure = true;
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "https://durden.arcan-fe.com/";
description = "Reference Desktop Environment for Arcan";
longDescription = ''
@@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
features in Arcan, and as a very competent entry to the advanced-user side
of the desktop environment spectrum.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/fm/fmtoy/package.nix
+70
View File
@@ -0,0 +1,70 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, alsa-lib
, libfmvoice
, libjack2
, pkg-config
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fmtoy";
version = "0.0.0-unstable-2023-05-21";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "fmtoy";
rev = "2b54180d8edd0de90e2af01bf9ff303bc916e893";
hash = "sha256-qoMw4P+QEw4Q/wKBvFPh+WxkmOW6qH9FuFFkO2ZRrMc=";
};
postPatch = ''
rmdir libfmvoice
cp --no-preserve=all -r ${libfmvoice.src} libfmvoice
substituteInPlace Makefile \
--replace 'pkg-config' "$PKG_CONFIG"
'';
strictDeps = true;
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsa-lib
libjack2
zlib
];
enableParallelBuilding = true;
buildFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"CXX=${stdenv.cc.targetPrefix}c++"
];
installPhase = ''
runHook preInstall
install -Dm755 fmtoy_jack $out/bin/fmtoy_jack
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater { };
};
meta = with lib; {
description = "FM synthesiser based on emulated Yamaha YM chips (OPL, OPM and OPN series)";
homepage = "https://github.com/vampirefrog/fmtoy";
license = licenses.gpl3Only;
mainProgram = "fmtoy_jack";
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.linux;
};
})
pkgs/by-name/ha/haredo/package.nix
+71
View File
@@ -0,0 +1,71 @@
{ stdenv
, lib
, fetchFromSourcehut
, hare
, scdoc
, nix-update-script
}:
stdenv.mkDerivation (finalAttrs: {
pname = "haredo";
version = "1.0.5";
outputs = [ "out" "man" ];
src = fetchFromSourcehut {
owner = "~autumnull";
repo = "haredo";
rev = finalAttrs.version;
hash = "sha256-gpui5FVRw3NKyx0AB/4kqdolrl5vkDudPOgjHc/IE4U=";
};
nativeBuildInputs = [
hare
scdoc
];
preBuild = ''
HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)"
export HARECACHE
export PREFIX=${builtins.placeholder "out"}
'';
buildPhase = ''
runHook preBuild
./bootstrap.sh
runHook postBuild
'';
checkPhase = ''
runHook preCheck
./bin/haredo test
runHook postCheck
'';
installPhase = ''
runHook preInstall
./bootstrap.sh install
runHook postInstall
'';
dontConfigure = true;
doCheck = true;
setupHook = ./setup-hook.sh;
passthru.updateScript = nix-update-script { };
meta = {
description = "A simple and unix-idiomatic build automator";
homepage = "https://sr.ht/~autumnull/haredo/";
license = lib.licenses.wtfpl;
maintainers = with lib.maintainers; [ onemoresuza ];
mainProgram = "haredo";
inherit (hare.meta) platforms badPlatforms;
};
})
pkgs/by-name/ha/haredo/setup-hook.sh
+69
View File
@@ -0,0 +1,69 @@
haredoBuildPhase() {
runHook preBuild
local buildTargets jobs
read -ra buildTargets <<<"${haredoBuildTargets-}"
echoCmd "haredo build targets" "${buildTargets[@]}"
if [[ ! -v enableParallelBuilding || -n "${enableParallelBuilding-}" ]]; then
jobs="${NIX_BUILD_CORES}"
fi
haredo ${jobs:+"-j${jobs}"} "${buildTargets[@]}"
runHook postBuild
}
haredoCheckPhase() {
runHook preCheck
local checkTargets jobs
if [[ -n "${haredoCheckTargets:-}" ]]; then
read -ra checkTargets <<<"${haredoCheckTargets}"
else
for dofile in "check.do" "test.do"; do
[[ -r "${dofile}" ]] && {
checkTargets=("${dofile%".do"}")
break
}
done
fi
if [[ -z "${checkTargets:-}" ]]; then
printf -- 'haredoCheckPhase ERROR: no check targets were found' 1>&2
exit 1
else
echoCmd "haredo check targets" "${checkTargets[@]}"
if [[ ! -v enableParallelChecking || -n "${enableParallelChecking-}" ]]; then
jobs="${NIX_BUILD_CORES}"
fi
haredo ${jobs:+"-j${jobs}"} "${checkTargets[@]}"
fi
runHook postCheck
}
haredoInstallPhase() {
runHook preInstall
local installTargets jobs
read -ra installTargets <<<"${haredoInstallTargets:-"install"}"
echoCmd "haredo install targets" "${installTargets[@]}"
if [[ ! -v enableParallelInstalling || -n "${enableParallelInstalling-}" ]]; then
jobs="${NIX_BUILD_CORES}"
fi
haredo ${jobs:+"-j${jobs}"} "${installTargets[@]}"
runHook postInstall
}
if [[ -z "${dontUseHaredoBuild-}" && -z "${buildPhase-}" ]]; then
buildPhase="haredoBuildPhase"
fi
if [[ -z "${dontUseHaredoCheck-}" && -z "${checkPhase-}" ]]; then
checkPhase="haredoCheckPhase"
fi
if [[ -z "${dontUseHaredoInstall-}" && -z "${installPhase-}" ]]; then
installPhase="haredoInstallPhase"
fi
pkgs/by-name/in/incus-unwrapped/package.nix
+1 -1
View File
@@ -95,7 +95,7 @@ buildGoModule rec {
homepage = "https://linuxcontainers.org/incus";
changelog = "https://github.com/lxc/incus/releases/tag/incus-${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ adamcstephens ];
maintainers = lib.teams.lxc.members;
platforms = lib.platforms.linux;
};
}
pkgs/by-name/li/libfmvoice/package.nix
+52
View File
@@ -0,0 +1,52 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libfmvoice";
version = "0.0.0-unstable-2023-12-05";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "libfmvoice";
rev = "38b1a0c627ef66fcd9c672c215d2b9849163df12";
hash = "sha256-kXthY9TynIXNX9wmgn13vs4Mrrv/dmEr7zlWiKstjGk=";
};
strictDeps = true;
enableParallelBuilding = true;
buildInputs = [
zlib
];
buildFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
runHook preInstall
for prog in $(grep 'PROGS=' Makefile | cut -d'=' -f2); do
install -Dm755 $prog $out/bin/$prog
done
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater { };
};
meta = with lib; {
description = "C library for loading, saving and converting FM sound chip voice files in various formats";
homepage = "https://github.com/vampirefrog/libfmvoice";
license = licenses.gpl3Only;
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
})
pkgs/by-name/li/linien-gui/package.nix
+47
View File
@@ -0,0 +1,47 @@
{ lib
, python3
, qt5
}:
python3.pkgs.buildPythonApplication rec {
pname = "linien-gui";
pyproject = true;
inherit (python3.pkgs.linien-common) src version;
sourceRoot = "source/linien-gui";
nativeBuildInputs = with python3.pkgs; [
setuptools
] ++ [
qt5.wrapQtAppsHook
];
# Makes qt-wayland appear in the qt paths injected by the wrapper - helps users
# with `QT_QPA_PLATFORM=wayland` in their environment.
buildInputs = [
qt5.qtwayland
];
propagatedBuildInputs = with python3.pkgs; [
appdirs
click
pyqtgraph
pyqt5
superqt
linien-client
];
dontWrapQtApps = true;
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with lib; {
description = "Graphical user interface of the Linien spectroscopy lock application";
homepage = "https://github.com/linien-org/linien/tree/develop/linien-gui";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fsagbuya doronbehar ];
};
}
pkgs/by-name/lx/lxd-to-incus/package.nix
+1 -1
View File
@@ -33,7 +33,7 @@ buildGoModule rec {
description = "LXD to Incus migration tool";
homepage = "https://linuxcontainers.org/incus";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ adamcstephens ];
maintainers = lib.teams.lxc.members;
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ma/matlab-language-server/package.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, fetchpatch
}:
buildNpmPackage {
pname = "matlab-language-server";
version = "1.1.6";
src = fetchFromGitHub {
owner = "mathworks";
repo = "matlab-language-server";
# Upstream doesn't tag commits unfortunatly, but lists versions and dates
# in README... See complaint at:
# https://github.com/mathworks/MATLAB-language-server/issues/24
rev = "c8c901956e3bbfbd6eab440a1b60c3fe016cf567";
hash = "sha256-D03gXyrvPYOMkJI2YuHfPAnWdXTz5baemykQ5j9L0rs=";
};
patches = [
# https://github.com/mathworks/MATLAB-language-server/pull/23
(fetchpatch {
url = "https://github.com/mathworks/MATLAB-language-server/commit/56374de620b4855529c4136539f52ab6030e2c92.patch";
hash = "sha256-F38ATP+eap0SnxQoib1JwIvNCFfB7g8EtXI9+iK5+HA=";
})
];
npmDepsHash = "sha256-P3MSrwk6FVt4lK58pjwy0YOg2UZI0TG8uXjqCPudgTE=";
npmBuildScript = "package";
meta = {
description = "Language Server for MATLAB® code";
homepage = "https://github.com/mathworks/MATLAB-language-server";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ doronbehar ];
mainProgram = "matlab-language-server";
};
}
pkgs/by-name/nw/nwg-drawer/package.nix
+2 -2
View File
@@ -12,13 +12,13 @@
let
pname = "nwg-drawer";
version = "0.4.1";
version = "0.4.3";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-drawer";
rev = "v${version}";
hash = "sha256-2/YI91Rcm+N8tNoKBRIDAQ3T2M6T7+kWngbCzyaXOCc=";
hash = "sha256-1iylXR3WP39E/0L/vBe5LxXOKV+KisgUr2rxBEHahMo=";
};
vendorHash = "sha256-8s8+ukMQpciQmKt77fNE7r+3cm/UDxO8VtkrNYdKhM8=";
pkgs/desktops/arcan/pipeworld/default.nix → pkgs/by-name/pi/pipeworld/package.nix
+7 -7
View File
@@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalPackages: {
pname = "pipeworld";
version = "unstable-2023-03-02";
version = "unstable-2023-02-05";
src = fetchFromGitHub {
owner = "letoram";
repo = "pipeworld";
rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e";
hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0=";
rev = "edc3821404b3a1274b8a50d2fb1c6b523fbd4a1c";
hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM=";
};
dontConfigure = true;
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalPackages: {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "https://github.com/letoram/pipeworld";
description = "Dataflow 'spreadsheet' desktop environment";
longDescription = ''
@@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation (finalPackages: {
application within another desktop as a 'substitute' for your normal
terminal emulator.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/pl/pls/Cargo.lock
Generated
+856
View File
@@ -0,0 +1,856 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "aho-corasick"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
[[package]]
name = "anstream"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is-terminal",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
[[package]]
name = "anstyle-parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle",
"windows-sys",
]
[[package]]
name = "atomic"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
[[package]]
name = "cc"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
dependencies = [
"jobserver",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "4.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d"
dependencies = [
"clap_builder",
"clap_derive",
"once_cell",
]
[[package]]
name = "clap_builder"
version = "4.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
"terminal_size",
]
[[package]]
name = "clap_derive"
version = "4.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "clap_lex"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "colored"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
dependencies = [
"is-terminal",
"lazy_static",
"windows-sys",
]
[[package]]
name = "env_logger"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
"log",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
"windows-sys",
]
[[package]]
name = "errno-dragonfly"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "fastrand"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
dependencies = [
"instant",
]
[[package]]
name = "figment"
version = "0.10.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5"
dependencies = [
"atomic",
"parking_lot",
"serde",
"serde_yaml",
"tempfile",
"uncased",
"version_check",
]
[[package]]
name = "form_urlencoded"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
[[package]]
name = "git2"
version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
dependencies = [
"bitflags 1.3.2",
"libc",
"libgit2-sys",
"log",
"url",
]
[[package]]
name = "hashbrown"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "home"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
dependencies = [
"windows-sys",
]
[[package]]
name = "idna"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
]
[[package]]
name = "indexmap"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
"equivalent",
"hashbrown",
]
[[package]]
name = "instant"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
]
[[package]]
name = "io-lifetimes"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi",
"libc",
"windows-sys",
]
[[package]]
name = "is-terminal"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
"rustix 0.38.3",
"windows-sys",
]
[[package]]
name = "itoa"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "jobserver"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
dependencies = [
"libc",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libgit2-sys"
version = "0.15.2+1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
dependencies = [
"cc",
"libc",
"libz-sys",
"pkg-config",
]
[[package]]
name = "libz-sys"
version = "1.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "121f7402cc6ab5821dad08d1b9d11618a9ea4da992343909fecf8e430e86364c"
dependencies = [
"cc",
"libc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
[[package]]
name = "lock_api"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "log"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "num_threads"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
dependencies = [
"libc",
]
[[package]]
name = "number_prefix"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "once_cell"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets",
]
[[package]]
name = "percent-encoding"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pkg-config"
version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "pls"
version = "0.0.1-beta.2"
dependencies = [
"clap",
"colored",
"env_logger",
"figment",
"git2",
"home",
"lazy_static",
"log",
"number_prefix",
"regex",
"serde",
"serde_regex",
"terminal_size",
"time",
"unicode-segmentation",
"users",
]
[[package]]
name = "proc-macro2"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
"bitflags 1.3.2",
]
[[package]]
name = "regex"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
[[package]]
name = "rustix"
version = "0.37.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
dependencies = [
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys 0.3.8",
"windows-sys",
]
[[package]]
name = "rustix"
version = "0.38.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
dependencies = [
"bitflags 2.3.3",
"errno",
"libc",
"linux-raw-sys 0.4.3",
"windows-sys",
]
[[package]]
name = "ryu"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.166"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.166"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_regex"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf"
dependencies = [
"regex",
"serde",
]
[[package]]
name = "serde_yaml"
version = "0.9.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85"
dependencies = [
"indexmap",
"itoa",
"ryu",
"serde",
"unsafe-libyaml",
]
[[package]]
name = "smallvec"
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "2.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "tempfile"
version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
dependencies = [
"autocfg",
"cfg-if",
"fastrand",
"redox_syscall",
"rustix 0.37.23",
"windows-sys",
]
[[package]]
name = "terminal_size"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
dependencies = [
"rustix 0.37.23",
"windows-sys",
]
[[package]]
name = "time"
version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
dependencies = [
"itoa",
"libc",
"num_threads",
"serde",
"time-core",
"time-macros",
]
[[package]]
name = "time-core"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
dependencies = [
"time-core",
]
[[package]]
name = "tinyvec"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
dependencies = [
"tinyvec_macros",
]
[[package]]
name = "tinyvec_macros"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "uncased"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68"
dependencies = [
"version_check",
]
[[package]]
name = "unicode-bidi"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
[[package]]
name = "unicode-normalization"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unsafe-libyaml"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
[[package]]
name = "url"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
]
[[package]]
name = "users"
version = "0.11.0"
source = "git+https://github.com/dhruvkb/rust-users.git#e6ba8a88e0127f0d17ddd99f80f85d2c1722b227"
dependencies = [
"libc",
]
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
pkgs/by-name/pl/pls/package.nix
+37
View File
@@ -0,0 +1,37 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "pls";
version = "0.0.1-beta.2";
src = fetchFromGitHub {
owner = "dhruvkb";
repo = "pls";
rev = "v${version}";
hash = "sha256-yMZygYrLi3V9MA+6vgqG+RHme5jtHMnork8aALbFVXc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"users-0.11.0" = "sha256-xBds73h68oWjKivEw92jEx0dVh08H2EIlBWnGx9DhyE=";
};
};
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = {
description = "Prettier and powerful ls";
homepage = "https://pls-rs.github.io/pls/";
license = lib.licenses.gpl3Plus;
mainProgram = "pls";
maintainers = with lib.maintainers; [ tomasajt ];
};
}
pkgs/by-name/pr/presenterm/package.nix
+12 -2
View File
@@ -1,4 +1,8 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ lib
, fetchFromGitHub
, rustPlatform
, libsixel
}:
rustPlatform.buildRustPackage rec {
pname = "presenterm";
@@ -7,12 +11,18 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "mfontanini";
repo = "presenterm";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-uwLVg/bURz2jLAQZgLujDR2Zewu5pcE9bwEBg/DQ4Iw=";
};
buildInputs = [
libsixel
];
cargoHash = "sha256-tEgXqvSyScO/J/56ykCda3ERrTDQj5jCxlMEDof/fCA=";
buildFeatures = [ "sixel" ];
# Skip test that currently doesn't work
checkFlags = [ "--skip=execute::test::shell_code_execution" ];
pkgs/desktops/arcan/prio/default.nix → pkgs/by-name/pr/prio/package.nix
+4 -4
View File
@@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "https://github.com/letoram/prio";
description = "Plan9- Rio like Window Manager for Arcan";
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/ra/raft-cowsql/package.nix
+1 -1
View File
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/cowsql/raft";
license = licenses.lgpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ adamcstephens ];
maintainers = teams.lxc.members;
};
}
pkgs/by-name/rc/rclip/package.nix
+46
View File
@@ -0,0 +1,46 @@
{ lib
, python3Packages
, fetchFromGitHub
}:
python3Packages.buildPythonApplication rec {
pname = "rclip";
version = "1.7.6";
pyproject = true;
src = fetchFromGitHub {
owner = "yurijmikhalevich";
repo = "rclip";
rev = "v${version}";
hash = "sha256-lWaWq+dcAa/2pONka4xRpixqDuL6iYDF46vCyCmVWwE=";
};
nativeBuildInputs = with python3Packages; [
poetry-core
];
propagatedBuildInputs = with python3Packages; [
open-clip-torch
pillow
requests
torch
torchvision
tqdm
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
pythonImportsCheck = [ "rclip" ];
disabledTestPaths = [
# requires network
"tests/e2e/test_rclip.py"
];
meta = with lib; {
description = "AI-Powered Command-Line Photo Search Tool";
homepage = "https://github.com/yurijmikhalevich/rclip";
license = licenses.mit;
maintainers = with maintainers; [ iynaix ];
mainProgram = "rclip";
};
}
pkgs/by-name/re/resources/package.nix
+66
View File
@@ -0,0 +1,66 @@
{ lib
, stdenv
, fetchFromGitHub
, appstream-glib
, cargo
, desktop-file-utils
, meson
, ninja
, pkg-config
, rustPlatform
, rustc
, wrapGAppsHook4
, glib
, gtk4
, libadwaita
}:
stdenv.mkDerivation (finalAttrs: {
pname = "resources";
version = "1.2.1";
src = fetchFromGitHub {
owner = "nokyan";
repo = "resources";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
name = "resources-${finalAttrs.version}";
hash = "sha256-MNYKfvbLQPWm7MKS5zYGrc+aoC9WeU5FTftkCrogZg0=";
};
nativeBuildInputs = [
appstream-glib
desktop-file-utils
meson
ninja
pkg-config
wrapGAppsHook4
rustPlatform.cargoSetupHook
cargo
rustc
];
buildInputs = [
glib
gtk4
libadwaita
];
mesonFlags = [
(lib.mesonOption "profile" "default")
];
meta = {
changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}";
description = "Monitor your system resources and processes";
homepage = "https://github.com/nokyan/resources";
license = lib.licenses.gpl3Only;
mainProgram = "resources";
maintainers = with lib.maintainers; [ lukas-heiligenbrunner ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/sy/syntax/package.nix
+30
View File
@@ -0,0 +1,30 @@
{ lib
, fetchFromGitHub
, buildNpmPackage
, stdenv
, nix-update-script
}:
buildNpmPackage rec {
pname = "syntax";
version = "0.1.27";
src = fetchFromGitHub {
owner = "DmitrySoshnikov";
repo = "syntax";
rev = "v${version}";
hash = "sha256-5ZbelnZQvJ9k4GbWR+lDEgxXGLt4VsXput9nBV8nUdc=";
};
npmDepsHash = "sha256-jZwbRGGg4tek6Jr+V7/SceJlsbIv7jFWQ+qa+fnChTw=";
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://github.com/DmitrySoshnikov/syntax";
description = "Syntactic analysis toolkit, language-agnostic parser generator";
license = licenses.mit;
maintainers = with maintainers; [ h7x4 ];
mainProgram = "syntax-cli";
broken = stdenv.isDarwin;
};
}
pkgs/by-name/ta/tailscale-nginx-auth/package.nix
+43
View File
@@ -0,0 +1,43 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
let
version = "1.48.2";
in
buildGoModule {
pname = "tailscale-nginx-auth";
inherit version;
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-5Usi7W4y6JniyxBIfQid1XjDIZRS5oIw+KUMMiFRBwk=";
};
vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4=";
CGO_ENABLED = 0;
subPackages = [ "cmd/nginx-auth" ];
ldflags = [
"-w"
"-s"
"-X tailscale.com/version.longStamp=${version}"
"-X tailscale.com/version.shortStamp=${version}"
];
postInstall = lib.optionalString stdenv.isLinux ''
mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth
sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service
install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.service
install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.socket
'';
meta = with lib; {
homepage = "https://tailscale.com";
description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy.";
license = licenses.bsd3;
mainProgram = "tailscale.nginx-auth";
maintainers = with maintainers; [ danderson phaer ];
};
}
pkgs/by-name/vg/vgm2x/package.nix
+57
View File
@@ -0,0 +1,57 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, libfmvoice
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vgm2x";
version = "0.0.0-unstable-2023-08-27";
src = fetchFromGitHub {
owner = "vampirefrog";
repo = "vgm2x";
rev = "5128055ab2b356e173b53e2afd31202a59505a39";
hash = "sha256-DwDcSUdfOsDlajYtzg5xM5P9QPOqLp8b0sEpE18kfzA=";
};
postPatch = ''
rmdir libfmvoice
cp --no-preserve=all -r ${libfmvoice.src} libfmvoice
'';
strictDeps = true;
enableParallelBuilding = true;
buildInputs = [
zlib
];
buildFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
runHook preInstall
install -Dm755 vgm2opm $out/bin/vgm2opm
runHook postInstall
'';
passthru = {
updateScript = unstableGitUpdater { };
};
meta = with lib; {
description = "VGM file extraction tools";
homepage = "https://github.com/vampirefrog/vgm2x";
license = licenses.gpl3Only;
mainProgram = "vgm2opm";
maintainers = with maintainers; [ OPNA2608 ];
platforms = platforms.all;
};
})
pkgs/desktops/arcan/xarcan/default.nix → pkgs/by-name/xa/xarcan/package.nix
+7 -7
View File
@@ -38,13 +38,13 @@
stdenv.mkDerivation (finalPackages: {
pname = "xarcan";
version = "unstable-2022-06-14";
version = "unstable-2023-11-03";
src = fetchFromGitHub {
owner = "letoram";
repo = "xarcan";
rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3";
hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk=";
rev = "380ea856307f593535dfc8b23799938db69e31b0";
hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4=";
};
nativeBuildInputs = [
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalPackages: {
"--with-xkb-path=${xkeyboard_config}/share/X11/xkb"
];
meta = with lib; {
meta = {
homepage = "https://github.com/letoram/letoram";
description = "Patched Xserver that bridges connections to Arcan";
longDescription = ''
@@ -112,8 +112,8 @@ stdenv.mkDerivation (finalPackages: {
arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It
allows running an X session as a window under Arcan.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/yg/yggdrasil/package.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yggdrasil";
version = "0.5.2";
version = "0.5.4";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
sha256 = "sha256-+E8CJs6m6iyMQNIqBbKLg8ghZR0FIuY5D1iDoUlaDyo=";
sha256 = "sha256-or+XTt8V/1BuLSJ53w1aKqJfx3Pka6VmC4TpvpP83+0=";
};
vendorHash = "sha256-FXlIrsl3fbWpEpwrY5moaJI0H0yXtrTQhHFu+ktWRVM=";
vendorHash = "sha256-K7VJ+1x7+DgdwTjEgZ7sJ7SaCssBg+ukQupJ/1FN4F0=";
subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ];
pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff
+39
View File
@@ -0,0 +1,39 @@
diff -Naur ytree-2.06-old/Makefile ytree-2.06-new/Makefile
--- ytree-2.06-old/Makefile 2023-11-26 06:15:34.000000000 -0300
+++ ytree-2.06-new/Makefile 2023-12-01 12:25:36.641958285 -0300
@@ -11,13 +11,13 @@
# ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys
#
-DESTDIR = /usr
+PREFIX = /usr
ADD_CFLAGS = -O # -DVI_KEYS
-BINDIR = $(DESTDIR)/bin
-MANDIR = $(DESTDIR)/share/man/man1
-MANESDIR = $(DESTDIR)/share/man/es/man1
+BINDIR = $(DESTDIR)$(PREFIX)/bin
+MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
+MANESDIR = $(DESTDIR)$(PREFIX)/share/man/es/man1
# Uncomment the lines for your system (default is linux)
@@ -224,14 +224,14 @@
install: $(MAIN)
install $(MAIN) $(BINDIR)
- gzip -9c ytree.1 > ytree.1.gz
+ gzip -n -9c ytree.1 > ytree.1.gz
if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz $(MANDIR)/; fi
- gzip -9c ytree.1.es > ytree.1.es.gz
+ gzip -n -9c ytree.1.es > ytree.1.es.gz
if [ -d $(MANESDIR) ]; then install -m 0644 ytree.1.es.gz $(MANESDIR)/; fi
clean:
rm -f core *.o *~ *.orig *.bak
-
+
clobber: clean
rm -f $(MAIN) ytree.1.es.gz ytree.1.gz
pkgs/by-name/yt/ytree/package.nix
+46
View File
@@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchurl
, ncurses
, readline
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ytree";
version = "2.06";
src = fetchurl {
url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz";
hash = "sha256-QRqI779ZnnytVUC7A7Zt0zyWexRwBnp+CVQcNvnvWeY=";
};
patches = [
# Two fixups (because diff files can't be smaller):
# - Create PREFIX instead of using DESTDIR
# - use gzip without timestamp, to improve reproducibility
./0001-use-prefix-and-gzip-n.diff
];
buildInputs = [
ncurses
readline
];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installFlags = [ "PREFIX=${placeholder "out"}" ];
preInstall = ''
mkdir -p $out/bin $out/share/man/man1
'';
meta = {
homepage = "https://www.han.de/~werner/ytree.html";
description = "A curses-based file manager similar to DOS Xtree(TM)";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "ytree";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})
# TODO: X11 support

Some files were not shown because too many files have changed in this diff Show More