colin/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-05-08 00:12:34 +00:00 committed by GitHub
commit 92ad9252fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
224 changed files with 3883 additions and 18404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/default.nix
View File

@ -50,6 +50,7 @@ rec {
else if final.isFreeBSD then "fblibc"
else if final.isNetBSD then "nblibc"
else if final.isAvr then "avrlibc"
else if final.isGhcjs then null
else if final.isNone then "newlib"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";

24
maintainers/maintainer-list.nix
View File

@ -1520,6 +1520,12 @@
githubId = 12958979;
name = "Mika Naylor";
};
autrimpo = {
email = "michal@koutensky.net";
github = "autrimpo";
githubId = 5968483;
name = "Michal Koutenský";
};
autumnal = {
name = "Sven Friedrich";
email = "sven@autumnal.de";
@ -2096,6 +2102,12 @@
githubId = 16330;
name = "Mathijs Kwik";
};
blusk = {
email = "bluskript@gmail.com";
github = "Bluskript";
githubId = 52386117;
name = "Blusk";
};
bmilanov = {
name = "Biser Milanov";
email = "bmilanov11+nixpkgs@gmail.com";
@ -2400,6 +2412,12 @@
githubId = 51231053;
name = "Daniel";
};
cadkin = {
email = "cva@siliconslumber.net";
name = "Cameron Adkins";
github = "cadkin";
githubId = 34077838;
};
cafkafk = {
email = "christina@cafkafk.com";
matrix = "@cafkafk:matrix.cafkafk.com";
@ -14262,6 +14280,12 @@
githubId = 251028;
name = "Shell Turner";
};
shhht = {
name = "shhht";
email = "stp.tjeerd@gmail.com";
github = "shhht";
githubId = 118352823;
};
shikanime = {
name = "William Phetsinorath";
email = "deva.shikanime@protonmail.com";

2
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -88,6 +88,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [networkd-dispatcher](https://gitlab.com/craftyguy/networkd-dispatcher), a dispatcher service for systemd-networkd connection status changes. Available as [services.networkd-dispatcher](#opt-services.networkd-dispatcher.enable).
- [gonic](https://github.com/sentriz/gonic), a Subsonic music streaming server. Available as [services.gonic](#opt-services.gonic.enable).
- [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable).
- [QDMR](https://dm3mat.darc.de/qdmr/), a GUI application and command line tool for programming DMR radios [programs.qdmr](#opt-programs.qdmr.enable)

3
nixos/modules/module-list.nix
View File

@ -153,6 +153,7 @@
./programs/cnping.nix
./programs/command-not-found/command-not-found.nix
./programs/criu.nix
./programs/darling.nix
./programs/dconf.nix
./programs/digitalbitbox/default.nix
./programs/dmrconfig.nix
@ -306,6 +307,7 @@
./services/audio/alsa.nix
./services/audio/botamusique.nix
./services/audio/gmediarender.nix
./services/audio/gonic.nix
./services/audio/hqplayerd.nix
./services/audio/icecast.nix
./services/audio/jack.nix
@ -1189,6 +1191,7 @@
./services/web-apps/komga.nix
./services/web-apps/lemmy.nix
./services/web-apps/limesurvey.nix
./services/web-apps/mainsail.nix
./services/web-apps/mastodon.nix
./services/web-apps/matomo.nix
./services/web-apps/mattermost.nix

21
nixos/modules/programs/darling.nix Normal file
View File

@ -0,0 +1,21 @@
{ config, lib, pkgs, ... }:
let
cfg = config.programs.darling;
in {
options = {
programs.darling = {
enable = lib.mkEnableOption (lib.mdDoc "Darling, a Darwin/macOS compatibility layer for Linux");
package = lib.mkPackageOptionMD pkgs "darling" {};
};
};
config = lib.mkIf cfg.enable {
security.wrappers.darling = {
source = lib.getExe cfg.package;
owner = "root";
group = "root";
setuid = true;
};
};
}

89
nixos/modules/services/audio/gonic.nix Normal file
View File

@ -0,0 +1,89 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.gonic;
settingsFormat = pkgs.formats.keyValue {
mkKeyValue = lib.generators.mkKeyValueDefault { } " ";
listsAsDuplicateKeys = true;
};
in
{
options = {
services.gonic = {
enable = mkEnableOption (lib.mdDoc "Gonic music server");
settings = mkOption rec {
type = settingsFormat.type;
apply = recursiveUpdate default;
default = {
listen-addr = "127.0.0.1:4747";
cache-path = "/var/cache/gonic";
tls-cert = null;
tls-key = null;
};
example = {
music-path = [ "/mnt/music" ];
podcast-path = "/mnt/podcasts";
};
description = lib.mdDoc ''
Configuration for Gonic, see <https://github.com/sentriz/gonic#configuration-options> for supported values.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.gonic = {
description = "Gonic Media Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart =
let
# these values are null by default but should not appear in the final config
filteredSettings = filterAttrs (n: v: !((n == "tls-cert" || n == "tls-key") && v == null)) cfg.settings;
in
"${pkgs.gonic}/bin/gonic -config-path ${settingsFormat.generate "gonic" filteredSettings}";
DynamicUser = true;
StateDirectory = "gonic";
CacheDirectory = "gonic";
WorkingDirectory = "/var/lib/gonic";
RuntimeDirectory = "gonic";
RootDirectory = "/run/gonic";
ReadWritePaths = "";
BindReadOnlyPaths = [
# gonic can access scrobbling services
"-/etc/ssl/certs/ca-certificates.crt"
builtins.storeDir
cfg.settings.podcast-path
] ++ cfg.settings.music-path
++ lib.optional (cfg.settings.tls-cert != null) cfg.settings.tls-cert
++ lib.optional (cfg.settings.tls-key != null) cfg.settings.tls-key;
CapabilityBoundingSet = "";
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
RestrictNamespaces = true;
PrivateDevices = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@privileged" ];
RestrictRealtime = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
UMask = "0066";
ProtectHostname = true;
};
};
};
meta.maintainers = [ maintainers.autrimpo ];
}

2
nixos/modules/services/misc/moonraker.nix
View File

@ -72,7 +72,7 @@ in {
example = {
authorization = {
trusted_clients = [ "10.0.0.0/24" ];
cors_domains = [ "https://app.fluidd.xyz" ];
cors_domains = [ "https://app.fluidd.xyz" "https://my.mainsail.xyz" ];
};
};
description = lib.mdDoc ''

66
nixos/modules/services/web-apps/mainsail.nix Normal file
View File

@ -0,0 +1,66 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.mainsail;
moonraker = config.services.moonraker;
in
{
options.services.mainsail = {
enable = mkEnableOption (lib.mdDoc "a modern and responsive user interface for Klipper");
package = mkOption {
type = types.package;
description = lib.mdDoc "Mainsail package to be used in the module";
default = pkgs.mainsail;
defaultText = literalExpression "pkgs.mainsail";
};
hostName = mkOption {
type = types.str;
default = "localhost";
description = lib.mdDoc "Hostname to serve mainsail on";
};
nginx = mkOption {
type = types.submodule
(import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
default = { };
example = literalExpression ''
{
serverAliases = [ "mainsail.''${config.networking.domain}" ];
}
'';
description = lib.mdDoc "Extra configuration for the nginx virtual host of mainsail.";
};
};
config = mkIf cfg.enable {
services.nginx = {
enable = true;
upstreams.mainsail-apiserver.servers."${moonraker.address}:${toString moonraker.port}" = { };
virtualHosts."${cfg.hostName}" = mkMerge [
cfg.nginx
{
root = mkForce "${cfg.package}/share/mainsail";
locations = {
"/" = {
index = "index.html";
tryFiles = "$uri $uri/ /index.html";
};
"/index.html".extraConfig = ''
add_header Cache-Control "no-store, no-cache, must-revalidate";
'';
"/websocket" = {
proxyWebsockets = true;
proxyPass = "http://mainsail-apiserver/websocket";
};
"~ ^/(printer|api|access|machine|server)/" = {
proxyWebsockets = true;
proxyPass = "http://mainsail-apiserver$request_uri";
};
};
}
];
};
};
}

33
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -113,10 +113,15 @@ let
]};
'') (filterAttrs (name: conf: conf.enable) cfg.proxyCachePath));
toUpstreamParameter = key: value:
if builtins.isBool value
then lib.optionalString value key
else "${key}=${toString value}";
upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: ''
upstream ${name} {
${toString (flip mapAttrsToList upstream.servers (name: server: ''
server ${name} ${optionalString server.backup "backup"};
server ${name} ${concatStringsSep " " (mapAttrsToList toUpstreamParameter server)};
''))}
${upstream.extraConfig}
}
@ -922,6 +927,7 @@ in
options = {
servers = mkOption {
type = types.attrsOf (types.submodule {
freeformType = types.attrsOf (types.oneOf [ types.bool types.int types.str ]);
options = {
backup = mkOption {
type = types.bool;
@ -935,9 +941,11 @@ in
});
description = lib.mdDoc ''
Defines the address and other parameters of the upstream servers.
See [the documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#server)
for the available parameters.
'';
default = {};
example = { "127.0.0.1:8000" = {}; };
example = lib.literalMD "see [](#opt-services.nginx.upstreams)";
};
extraConfig = mkOption {
type = types.lines;
@ -952,14 +960,23 @@ in
Defines a group of servers to use as proxy target.
'';
default = {};
example = literalExpression ''
"backend_server" = {
servers = { "127.0.0.1:8000" = {}; };
extraConfig = ''''
example = {
"backend" = {
servers = {
"backend1.example.com:8080" = { weight = 5; };
"backend2.example.com" = { max_fails = 3; fail_timeout = "30s"; };
"backend3.example.com" = {};
"backup1.example.com" = { backup = true; };
"backup2.example.com" = { backup = true; };
};
extraConfig = ''
keepalive 16;
'''';
'';
};
'';
"memcached" = {
servers."unix:/run//memcached/memcached.sock" = {};
};
};
};
virtualHosts = mkOption {

6
nixos/modules/system/boot/networkd.nix
View File

@ -70,6 +70,9 @@ let
"CombinedChannels"
"RxBufferSize"
"TxBufferSize"
"ReceiveQueues"
"TransmitQueues"
"TransmitQueueLength"
])
(assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"])
(assertMacAddress "MACAddress")
@ -96,6 +99,9 @@ let
(assertRange "CombinedChannels" 1 4294967295)
(assertInt "RxBufferSize")
(assertInt "TxBufferSize")
(assertRange "ReceiveQueues" 1 4096)
(assertRange "TransmitQueues" 1 4096)
(assertRange "TransmitQueueLength" 1 4294967294)
];
};

2
nixos/tests/all-tests.nix
View File

@ -180,6 +180,7 @@ in {
cups-pdf = handleTest ./cups-pdf.nix {};
custom-ca = handleTest ./custom-ca.nix {};
croc = handleTest ./croc.nix {};
darling = handleTest ./darling.nix {};
deepin = handleTest ./deepin.nix {};
deluge = handleTest ./deluge.nix {};
dendrite = handleTest ./matrix/dendrite.nix {};
@ -279,6 +280,7 @@ in {
gocd-agent = handleTest ./gocd-agent.nix {};
gocd-server = handleTest ./gocd-server.nix {};
gollum = handleTest ./gollum.nix {};
gonic = handleTest ./gonic.nix {};
google-oslogin = handleTest ./google-oslogin {};
gotify-server = handleTest ./gotify-server.nix {};
grafana = handleTest ./grafana {};

44
nixos/tests/darling.nix Normal file
View File

@ -0,0 +1,44 @@
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
# Well, we _can_ cross-compile from Linux :)
hello = pkgs.runCommand "hello" {
sdk = "${pkgs.darling.sdk}/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk";
nativeBuildInputs = with pkgs.llvmPackages_latest; [ clang-unwrapped lld ];
src = pkgs.writeText "hello.c" ''
#include <stdio.h>
int main() {
printf("Hello, Darling!\n");
return 0;
}
'';
} ''
clang \
-target x86_64-apple-darwin \
-fuse-ld=lld \
-nostdinc -nostdlib \
-mmacosx-version-min=10.15 \
--sysroot $sdk \
-isystem $sdk/usr/include \
-L $sdk/usr/lib -lSystem \
$src -o $out
'';
in
{
name = "darling";
meta.maintainers = with lib.maintainers; [ zhaofengli ];
nodes.machine = {
programs.darling.enable = true;
};
testScript = ''
start_all()
# Darling holds stdout until the server is shutdown
machine.succeed("darling ${hello} >hello.out")
machine.succeed("grep Hello hello.out")
machine.succeed("darling shutdown")
'';
})

18
nixos/tests/gonic.nix Normal file
View File

@ -0,0 +1,18 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "gonic";
nodes.machine = { ... }: {
services.gonic = {
enable = true;
settings = {
music-path = [ "/tmp" ];
podcast-path = "/tmp";
};
};
};
testScript = ''
machine.wait_for_unit("gonic")
machine.wait_for_open_port(4747)
'';
})

4
pkgs/applications/audio/audacity/default.nix
View File

@ -61,13 +61,13 @@
stdenv.mkDerivation rec {
pname = "audacity";
version = "3.3.1";
version = "3.3.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "Audacity-${version}";
hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";
hash = "sha256-/DjTmanPzkShNoMFNbnQzzwEzk/a2uUYvVW9dsvl5uY=";
};
postPatch = ''

2
pkgs/applications/audio/faust/faust2.nix
View File

@ -50,7 +50,7 @@ let
passthru = {
inherit wrap wrapWithBuildEnv;
inherit wrap wrapWithBuildEnv faust2ApplBase;
};

38
pkgs/applications/audio/faust/faust2sc.nix Normal file
View File

@ -0,0 +1,38 @@
{ faust
, baseName ? "faust2sc"
, supercollider
, makeWrapper
, python3
, stdenv
}@args:
let
faustDefaults = faust.faust2ApplBase
(args // {
baseName = "${baseName}.py";
});
in
stdenv.mkDerivation (faustDefaults // {
nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ python3 faust supercollider ];
postInstall = ''
mv "$out/bin/${baseName}.py" "$out"/bin/${baseName}
'';
postFixup = ''
# export parts of the build environment
mkdir "$out"/include
# until pr #887 is merged and released in faust we need to link the header folders
ln -s "${supercollider}"/include/SuperCollider/plugin_interface "$out"/include/plugin_interface
ln -s "${supercollider}"/include/SuperCollider/common "$out"/include/common
ln -s "${supercollider}"/include/SuperCollider/server "$out"/include/server
wrapProgram "$out"/bin/${baseName} \
--append-flags "--import-dir ${faust}/share/faust" \
--append-flags "--architecture-dir ${faust}/share/faust" \
--append-flags "--architecture-dir ${faust}/include" \
--append-flags "-p $out" \
--prefix PATH : "$PATH"
'';
})

4
pkgs/applications/audio/monkeys-audio/default.nix
View File

@ -5,13 +5,13 @@
}:
stdenv.mkDerivation rec {
version = "10.10";
version = "10.11";
pname = "monkeys-audio";
src = fetchzip {
url = "https://monkeysaudio.com/files/MAC_${
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
sha256 = "sha256-fDH7F9xLfR9Q2T3HCirBWdKB7Kb1vxyo8g0PNzHzMCY=";
sha256 = "sha256-sA1JXRbyHMHBCsWau9GrlxeRiCzxZfCTuLFebZmIoRE=";
stripRoot = false;
};
nativeBuildInputs = [

1
pkgs/applications/audio/polyphone/default.nix
View File

@ -36,7 +36,6 @@ mkDerivation rec {
qmakeFlags = [
"DEFINES+=USE_LOCAL_STK"
"DEFINES+=USE_LOCAL_QCUSTOMPLOT"
"INCLUDEPATH+=${libjack2}/include/jack"
];
meta = with lib; {

4
pkgs/applications/audio/spotify/linux.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
, pname, meta, harfbuzz
@ -47,7 +47,7 @@ let
libpulseaudio
libxkbcommon
mesa
nss
nss_latest
pango
stdenv.cc.cc
systemd

8
pkgs/applications/audio/vcv-rack/default.nix
View File

@ -87,8 +87,8 @@ let
fundamental-source = fetchFromGitHub {
owner = "VCVRack";
repo = "Fundamental";
rev = "f80e1a0e78dc043a0ff0b777ef98a36b91063622"; # tip of branch v2
sha256 = "0hnwrr1xhf7dpkw1v63f633x5dlrvijgbah4aj5h5xr2jchip9nx";
rev = "v2.3.1"; # tip of branch v2
sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr";
};
vcv-rtaudio = stdenv.mkDerivation rec {
pname = "vcv-rtaudio";
@ -115,7 +115,7 @@ let
in
stdenv.mkDerivation rec {
pname = "VCV-Rack";
version = "2.2.1";
version = "2.3.0";
desktopItems = [
(makeDesktopItem {
@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
sha256 = "079alr6y0101k92v5lrnycljcbifh0hsvklbf4w5ax2zrxnyplq8";
sha256 = "1aj7pcvks1da5ydagyxsdksp31rf8dn0bixw55kn34k0g4ky5jiw";
};
patches = [

4
pkgs/applications/blockchains/btcpayserver/default.nix
View File

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
version = "1.7.12";
version = "1.9.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q=";
sha256 = "sha256-N/6/a9K8ROSJ+rsip85Av1jmggI12Clr61+9Dh56Lls=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";

10
pkgs/applications/blockchains/btcpayserver/deps.nix generated
View File

@ -8,15 +8,15 @@
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.20"; sha256 = "1vnzmczd4z25vbf987p4vp6sxc09fp6mvhrvq41iwj1ks5zcprlf"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.23"; sha256 = "11nb7ba93g51n5f5aa6sd6s3f9x82g1vbi8rcj04x5anbh2g451n"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.25"; sha256 = "0172czzzlgsljgmhb5wh8cb1cl12ac54qyzmd3w18wbkxmr205qk"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.26"; sha256 = "0sbcl1jdpjgjpa4cagcrppk124nkk2hxsvlj8nr6zf3fcdwllagj"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.18"; sha256 = "0vnnnm9c5w8ag3a25fzmsjax028ykb7xr4fp7saq4si3bmzkjswp"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.15"; sha256 = "18qnpdxbz359ygygllsrf95fbalsfyjrf6j9wi7c8qd39jwcignx"; })
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.19"; sha256 = "164c5nmsqzgz9v6fw0ml0d9m5hcp449468giakv3cihq25cd6giz"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
(fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })
@ -38,7 +38,7 @@
(fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; })
(fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; })
(fetchNuGet { pname = "LNURL"; version = "0.0.28"; sha256 = "1fcrq5ib02scz6n4zvmnbvm2aahj6qwwq6wsfix90caqm2c2bq64"; })
(fetchNuGet { pname = "LNURL"; version = "0.0.29"; sha256 = "00d9n2lgn3paqm12c563rv8slxrbbxq6m58m098l30wsm96llj0r"; })
(fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; })
(fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; })
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; })

231
pkgs/applications/emulators/darling/default.nix Normal file
View File

@ -0,0 +1,231 @@
{ clangStdenv
, lib
, runCommandWith
, writeShellScript
, fetchFromGitHub
, fetchpatch
, freetype
, libjpeg
, libpng
, libtiff
, giflib
, libX11
, libXext
, libXrandr
, libXcursor
, libxkbfile
, cairo
, libglvnd
, fontconfig
, dbus
, libGLU
, fuse
, ffmpeg
, pulseaudio
, makeWrapper
, python2
, python3
, cmake
, ninja
, pkg-config
, bison
, flex
, libbsd
, openssl
, xdg-user-dirs
, addOpenGLRunpath
# Whether to pre-compile Python 2 bytecode for performance.
, compilePy2Bytecode ? false
}:
let
stdenv = clangStdenv;
# The build system invokes clang to compile Darwin executables.
# In this case, our cc-wrapper must not be used.
ccWrapperBypass = runCommandWith {
inherit stdenv;
name = "cc-wrapper-bypass";
runLocal = false;
derivationArgs = {
template = writeShellScript "template" ''
for (( i=1; i<=$#; i++)); do
j=$((i+1))
if [[ "''${!i}" == "-target" && "''${!j}" == *"darwin"* ]]; then
# their flags must take precedence
exec @unwrapped@ "$@" $NIX_CFLAGS_COMPILE
fi
done
exec @wrapped@ "$@"
'';
};
} ''
unwrapped_bin=${stdenv.cc.cc}/bin
wrapped_bin=${stdenv.cc}/bin
mkdir -p $out/bin
unwrapped=$unwrapped_bin/$CC wrapped=$wrapped_bin/$CC \
substituteAll $template $out/bin/$CC
unwrapped=$unwrapped_bin/$CXX wrapped=$wrapped_bin/$CXX \
substituteAll $template $out/bin/$CXX
chmod +x $out/bin/$CC $out/bin/$CXX
'';
wrappedLibs = [
# To find all of them: rg -w wrap_elf
# src/native/CMakeLists.txt
freetype
libjpeg
libpng
libtiff
giflib
libX11
libXext
libXrandr
libXcursor
libxkbfile
cairo
libglvnd
fontconfig
dbus
libGLU
# src/external/darling-dmg/CMakeLists.txt
fuse
# src/CoreAudio/CMakeLists.txt
ffmpeg
pulseaudio
];
in stdenv.mkDerivation {
pname = "darling";
version = "unstable-2023-05-02";
src = fetchFromGitHub {
owner = "darlinghq";
repo = "darling";
rev = "557e7e9dece394a3f623825679474457e5b64fd0";
fetchSubmodules = true;
hash = "sha256-SOoLaV7wg33qRHPQXkdMvrY++CvoG85kwd6IU6DkYa0=";
};
outputs = [ "out" "sdk" ];
postPatch = ''
# We have to be careful - Patching everything indiscriminately
# would affect Darwin scripts as well
chmod +x src/external/bootstrap_cmds/migcom.tproj/mig.sh
patchShebangs \
src/external/bootstrap_cmds/migcom.tproj/mig.sh \
src/external/darlingserver/scripts \
src/external/openssl_certificates/scripts
substituteInPlace src/startup/CMakeLists.txt --replace SETUID ""
substituteInPlace src/external/basic_cmds/CMakeLists.txt --replace SETGID ""
'';
nativeBuildInputs = [
bison
ccWrapperBypass
cmake
flex
makeWrapper
ninja
pkg-config
python3
]
++ lib.optional compilePy2Bytecode python2;
buildInputs = wrappedLibs ++ [
libbsd
openssl
stdenv.cc.libc.linuxHeaders
];
# Breaks valid paths like
# Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
dontFixCmake = true;
# src/external/objc4 forces OBJC_IS_DEBUG_BUILD=1, which conflicts with NDEBUG
# TODO: Fix in a better way
cmakeBuildType = " ";
cmakeFlags = [
"-DTARGET_i386=OFF"
"-DCOMPILE_PY2_BYTECODE=${if compilePy2Bytecode then "ON" else "OFF"}"
"-DDARLINGSERVER_XDG_USER_DIR_CMD=${xdg-user-dirs}/bin/xdg-user-dir"
];
env.NIX_CFLAGS_COMPILE = "-Wno-macro-redefined -Wno-unused-command-line-argument";
# Linux .so's are dlopen'd by wrapgen during the build
env.LD_LIBRARY_PATH = lib.makeLibraryPath wrappedLibs;
# Breaks shebangs of Darwin scripts
dontPatchShebangs = true;
postInstall = ''
# Install the SDK as a separate output
mkdir -p $sdk
sdkDir=$(readlink -f ../Developer)
while read -r path; do
dst="$sdk/Developer/''${path#$sdkDir}"
if [[ -L "$path" ]]; then
target=$(readlink -m "$path")
if [[ -e "$target" && "$target" == "$NIX_BUILD_TOP"* && "$target" != "$sdkDir"* ]]; then
# dereference
cp -r -L "$path" "$dst"
elif [[ -e "$target" ]]; then
# preserve symlink
cp -d "$path" "$dst"
else
# ignore symlink
>&2 echo "Ignoring symlink $path -> $target"
fi
elif [[ -f $path ]]; then
cp "$path" "$dst"
elif [[ -d $path ]]; then
mkdir -p "$dst"
fi
done < <(find $sdkDir)
mkdir -p $sdk/bin
cp src/external/cctools-port/cctools/ld64/src/*-ld $sdk/bin
cp src/external/cctools-port/cctools/ar/*-{ar,ranlib} $sdk/bin
'';
postFixup = ''
echo "Checking for references to $NIX_STORE in Darling root..."
set +e
grep -r --exclude=mldr "$NIX_STORE" $out/libexec/darling
ret=$?
set -e
if [[ $ret == 0 ]]; then
echo "Found references to $NIX_STORE in Darling root (see above)"
exit 1
fi
patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addOpenGLRunpath.driverLink}/lib" \
$out/libexec/darling/usr/libexec/darling/mldr
'';
meta = with lib; {
description = "Open-source Darwin/macOS emulation layer for Linux";
homepage = "https://www.darlinghq.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ zhaofengli ];
platforms = [ "x86_64-linux" ];
};
}

6
pkgs/applications/graphics/pdfcpu/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pdfcpu";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-l3vJDF2c6h/trfnAGxu7XEoDoj7bB4tATBUlxKFYfUs=";
sha256 = "sha256-4crBl0aQFsSB1D3iuAVcwcet8KSUB3/tUi1kD1VmpAI=";
};
vendorSha256 = "sha256-611eLYm+OPIdmax2KwYNjuQEGqyZd6SXvhUHzRdLzaI=";
vendorHash = "sha256-qFupm0ymDw9neAu6Xl3fQ/mMWn9f40Vdf7uOLOBkcaE=";
# No tests
doCheck = false;

4
pkgs/applications/misc/ArchiSteamFarm/default.nix
View File

@ -13,13 +13,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
version = "5.4.4.5";
version = "5.4.5.2";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
sha256 = "sha256-xSHoBKhqEmWf9BXWhlsMqKGhgeeQi0zSG1nxNzivr7g=";
sha256 = "sha256-l3qcdgTTpbI4Jdy1jpzyCiAFglJfzBHkb6hLIZ4hDKQ=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;

4
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
View File

@ -11,8 +11,8 @@ let
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = "bc84d62e4f60f24cca6e9f8e820c30c750bcb0de";
sha256 = "10z3jv551f41f2k9p6y0yhrqk6jr8pmpkrd479s1zfj40ywh48bc";
rev = "114c390c92a889b86cf560def28fb8f39bc4fe54";
sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826";
};
in

380
pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix generated
View File

@ -976,13 +976,13 @@ let
sha512 = "3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==";
};
};
"@eslint/js-8.37.0" = {
"@eslint/js-8.39.0" = {
name = "_at_eslint_slash_js";
packageName = "@eslint/js";
version = "8.37.0";
version = "8.39.0";
src = fetchurl {
url = "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz";
sha512 = "x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==";
url = "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz";
sha512 = "kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==";
};
};
"@fortawesome/fontawesome-common-types-6.4.0" = {
@ -1093,6 +1093,15 @@ let
sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==";
};
};
"@jridgewell/source-map-0.3.3" = {
name = "_at_jridgewell_slash_source-map";
packageName = "@jridgewell/source-map";
version = "0.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz";
sha512 = "b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==";
};
};
"@jridgewell/sourcemap-codec-1.4.14" = {
name = "_at_jridgewell_slash_sourcemap-codec";
packageName = "@jridgewell/sourcemap-codec";
@ -1219,13 +1228,13 @@ let
sha512 = "PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==";
};
};
"@types/estree-0.0.51" = {
"@types/estree-1.0.0" = {
name = "_at_types_slash_estree";
packageName = "@types/estree";
version = "0.0.51";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz";
sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==";
url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz";
sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==";
};
};
"@types/express-4.17.13" = {
@ -1399,139 +1408,139 @@ let
sha512 = "rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg==";
};
};
"@webassemblyjs/ast-1.11.1" = {
"@webassemblyjs/ast-1.11.5" = {
name = "_at_webassemblyjs_slash_ast";
packageName = "@webassemblyjs/ast";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz";
sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==";
url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz";
sha512 = "LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==";
};
};
"@webassemblyjs/floating-point-hex-parser-1.11.1" = {
"@webassemblyjs/floating-point-hex-parser-1.11.5" = {
name = "_at_webassemblyjs_slash_floating-point-hex-parser";
packageName = "@webassemblyjs/floating-point-hex-parser";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz";
sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==";
url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz";
sha512 = "1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==";
};
};
"@webassemblyjs/helper-api-error-1.11.1" = {
"@webassemblyjs/helper-api-error-1.11.5" = {
name = "_at_webassemblyjs_slash_helper-api-error";
packageName = "@webassemblyjs/helper-api-error";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz";
sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==";
url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz";
sha512 = "L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==";
};
};
"@webassemblyjs/helper-buffer-1.11.1" = {
"@webassemblyjs/helper-buffer-1.11.5" = {
name = "_at_webassemblyjs_slash_helper-buffer";
packageName = "@webassemblyjs/helper-buffer";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz";
sha512 = "gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==";
url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz";
sha512 = "fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==";
};
};
"@webassemblyjs/helper-numbers-1.11.1" = {
"@webassemblyjs/helper-numbers-1.11.5" = {
name = "_at_webassemblyjs_slash_helper-numbers";
packageName = "@webassemblyjs/helper-numbers";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz";
sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==";
url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz";
sha512 = "DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==";
};
};
"@webassemblyjs/helper-wasm-bytecode-1.11.1" = {
"@webassemblyjs/helper-wasm-bytecode-1.11.5" = {
name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
packageName = "@webassemblyjs/helper-wasm-bytecode";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz";
sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==";
url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz";
sha512 = "oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==";
};
};
"@webassemblyjs/helper-wasm-section-1.11.1" = {
"@webassemblyjs/helper-wasm-section-1.11.5" = {
name = "_at_webassemblyjs_slash_helper-wasm-section";
packageName = "@webassemblyjs/helper-wasm-section";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz";
sha512 = "10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==";
url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz";
sha512 = "uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==";
};
};
"@webassemblyjs/ieee754-1.11.1" = {
"@webassemblyjs/ieee754-1.11.5" = {
name = "_at_webassemblyjs_slash_ieee754";
packageName = "@webassemblyjs/ieee754";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz";
sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==";
url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz";
sha512 = "37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==";
};
};
"@webassemblyjs/leb128-1.11.1" = {
"@webassemblyjs/leb128-1.11.5" = {
name = "_at_webassemblyjs_slash_leb128";
packageName = "@webassemblyjs/leb128";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz";
sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==";
url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz";
sha512 = "ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==";
};
};
"@webassemblyjs/utf8-1.11.1" = {
"@webassemblyjs/utf8-1.11.5" = {
name = "_at_webassemblyjs_slash_utf8";
packageName = "@webassemblyjs/utf8";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz";
sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==";
url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz";
sha512 = "WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==";
};
};
"@webassemblyjs/wasm-edit-1.11.1" = {
"@webassemblyjs/wasm-edit-1.11.5" = {
name = "_at_webassemblyjs_slash_wasm-edit";
packageName = "@webassemblyjs/wasm-edit";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz";
sha512 = "g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==";
url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz";
sha512 = "C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==";
};
};
"@webassemblyjs/wasm-gen-1.11.1" = {
"@webassemblyjs/wasm-gen-1.11.5" = {
name = "_at_webassemblyjs_slash_wasm-gen";
packageName = "@webassemblyjs/wasm-gen";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz";
sha512 = "F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==";
url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz";
sha512 = "14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==";
};
};
"@webassemblyjs/wasm-opt-1.11.1" = {
"@webassemblyjs/wasm-opt-1.11.5" = {
name = "_at_webassemblyjs_slash_wasm-opt";
packageName = "@webassemblyjs/wasm-opt";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz";
sha512 = "VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==";
url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz";
sha512 = "tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==";
};
};
"@webassemblyjs/wasm-parser-1.11.1" = {
"@webassemblyjs/wasm-parser-1.11.5" = {
name = "_at_webassemblyjs_slash_wasm-parser";
packageName = "@webassemblyjs/wasm-parser";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz";
sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==";
url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz";
sha512 = "SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==";
};
};
"@webassemblyjs/wast-printer-1.11.1" = {
"@webassemblyjs/wast-printer-1.11.5" = {
name = "_at_webassemblyjs_slash_wast-printer";
packageName = "@webassemblyjs/wast-printer";
version = "1.11.1";
version = "1.11.5";
src = fetchurl {
url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz";
sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==";
url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz";
sha512 = "f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==";
};
};
"@webpack-cli/configtest-1.2.0" = {
@ -1624,15 +1633,6 @@ let
sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==";
};
};
"ajv-6.12.5" = {
name = "ajv";
packageName = "ajv";
version = "6.12.5";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz";
sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==";
};
};
"ajv-6.12.6" = {
name = "ajv";
packageName = "ajv";
@ -1840,13 +1840,13 @@ let
sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==";
};
};
"axios-1.3.4" = {
"axios-1.3.6" = {
name = "axios";
packageName = "axios";
version = "1.3.4";
version = "1.3.6";
src = fetchurl {
url = "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz";
sha512 = "toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==";
url = "https://registry.npmjs.org/axios/-/axios-1.3.6.tgz";
sha512 = "PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==";
};
};
"babel-loader-9.1.2" = {
@ -2677,13 +2677,13 @@ let
sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
};
};
"enhanced-resolve-5.10.0" = {
"enhanced-resolve-5.13.0" = {
name = "enhanced-resolve";
packageName = "enhanced-resolve";
version = "5.10.0";
version = "5.13.0";
src = fetchurl {
url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz";
sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==";
url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz";
sha512 = "eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==";
};
};
"entities-2.2.0" = {
@ -2713,13 +2713,13 @@ let
sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==";
};
};
"es-module-lexer-0.9.3" = {
"es-module-lexer-1.2.1" = {
name = "es-module-lexer";
packageName = "es-module-lexer";
version = "0.9.3";
version = "1.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz";
sha512 = "1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==";
url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz";
sha512 = "9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==";
};
};
"es-set-tostringtag-2.0.1" = {
@ -2785,13 +2785,13 @@ let
sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
};
};
"eslint-8.37.0" = {
"eslint-8.39.0" = {
name = "eslint";
packageName = "eslint";
version = "8.37.0";
version = "8.39.0";
src = fetchurl {
url = "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz";
sha512 = "NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==";
url = "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz";
sha512 = "mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==";
};
};
"eslint-config-airbnb-base-15.0.0" = {
@ -2830,13 +2830,13 @@ let
sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==";
};
};
"eslint-plugin-vue-9.10.0" = {
"eslint-plugin-vue-9.11.0" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
version = "9.10.0";
version = "9.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.10.0.tgz";
sha512 = "2MgP31OBf8YilUvtakdVMc8xVbcMp7z7/iQj8LHVpXrSXHPXSJRUIGSPFI6b6pyCx/buKaFJ45ycqfHvQRiW2g==";
url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.11.0.tgz";
sha512 = "bBCJAZnkBV7ATH4Z1E7CvN3nmtS4H7QUU3UBxPdo8WohRU+yHjnQRALpTbxMVcz0e4Mx3IyxIdP5HYODMxK9cQ==";
};
};
"eslint-scope-5.1.1" = {
@ -2857,6 +2857,15 @@ let
sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==";
};
};
"eslint-scope-7.2.0" = {
name = "eslint-scope";
packageName = "eslint-scope";
version = "7.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz";
sha512 = "DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==";
};
};
"eslint-visitor-keys-2.1.0" = {
name = "eslint-visitor-keys";
packageName = "eslint-visitor-keys";
@ -3523,13 +3532,13 @@ let
sha512 = "AgYO3UGhMYQx2S/FBJT3EM0ZYcKmH6m9XL9c1v77BeK/tYJxGPxT1/AtsdUi4FcP8kZGmqqnItCcjFPcX9hk6A==";
};
};
"html-webpack-plugin-5.5.0" = {
"html-webpack-plugin-5.5.1" = {
name = "html-webpack-plugin";
packageName = "html-webpack-plugin";
version = "5.5.0";
version = "5.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz";
sha512 = "sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==";
url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.1.tgz";
sha512 = "cTUzZ1+NqjGEKjmVgZKLMdiFg3m9MdRXkZW2OEe69WYVi5ONLMmlnSZdXzGGMOq0C8jGDrL6EWyEDDUioHO/pA==";
};
};
"htmlparser2-6.1.0" = {
@ -5413,13 +5422,13 @@ let
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
"sass-1.60.0" = {
"sass-1.62.0" = {
name = "sass";
packageName = "sass";
version = "1.60.0";
version = "1.62.0";
src = fetchurl {
url = "https://registry.npmjs.org/sass/-/sass-1.60.0.tgz";
sha512 = "updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==";
url = "https://registry.npmjs.org/sass/-/sass-1.62.0.tgz";
sha512 = "Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==";
};
};
"sass-loader-13.2.2" = {
@ -5431,22 +5440,13 @@ let
sha512 = "nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==";
};
};
"schema-utils-3.0.0" = {
"schema-utils-3.1.2" = {
name = "schema-utils";
packageName = "schema-utils";
version = "3.0.0";
version = "3.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz";
sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==";
};
};
"schema-utils-3.1.1" = {
name = "schema-utils";
packageName = "schema-utils";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz";
sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==";
url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz";
sha512 = "pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==";
};
};
"schema-utils-4.0.0" = {
@ -5458,6 +5458,15 @@ let
sha512 = "1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==";
};
};
"schema-utils-4.0.1" = {
name = "schema-utils";
packageName = "schema-utils";
version = "4.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.1.tgz";
sha512 = "lELhBAAly9NowEsX0yZBlw9ahZG+sK/1RJ21EpzdYHKEs13Vku3LJ+MIPhh4sMs0oCCeufZQEQbMekiA4vuVIQ==";
};
};
"select-hose-2.0.0" = {
name = "select-hose";
packageName = "select-hose";
@ -5503,13 +5512,13 @@ let
sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==";
};
};
"serialize-javascript-6.0.0" = {
"serialize-javascript-6.0.1" = {
name = "serialize-javascript";
packageName = "serialize-javascript";
version = "6.0.0";
version = "6.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz";
sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==";
url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz";
sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==";
};
};
"serve-index-1.9.1" = {
@ -5638,15 +5647,6 @@ let
sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
};
};
"source-map-0.7.3" = {
name = "source-map";
packageName = "source-map";
version = "0.7.3";
src = fetchurl {
url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";
sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
};
};
"source-map-js-1.0.2" = {
name = "source-map-js";
packageName = "source-map-js";
@ -5809,22 +5809,22 @@ let
sha512 = "FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==";
};
};
"terser-5.9.0" = {
"terser-5.16.9" = {
name = "terser";
packageName = "terser";
version = "5.9.0";
version = "5.16.9";
src = fetchurl {
url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz";
sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==";
url = "https://registry.npmjs.org/terser/-/terser-5.16.9.tgz";
sha512 = "HPa/FdTB9XGI2H1/keLFZHxl6WNvAI4YalHGtDQTlMnJcoqSab1UwL4l1hGEhs6/GmLHBZIg/YgB++jcbzoOEg==";
};
};
"terser-webpack-plugin-5.3.0" = {
"terser-webpack-plugin-5.3.7" = {
name = "terser-webpack-plugin";
packageName = "terser-webpack-plugin";
version = "5.3.0";
version = "5.3.7";
src = fetchurl {
url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz";
sha512 = "LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==";
url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz";
sha512 = "AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==";
};
};
"text-table-0.2.0" = {
@ -6106,13 +6106,13 @@ let
sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==";
};
};
"vue-eslint-parser-9.1.0" = {
"vue-eslint-parser-9.1.1" = {
name = "vue-eslint-parser";
packageName = "vue-eslint-parser";
version = "9.1.0";
version = "9.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz";
sha512 = "NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==";
url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.1.tgz";
sha512 = "C2aI/r85Q6tYcz4dpgvrs4wH/MqVrRAVIdpYedrxnATDHHkb+TroeRcDpKWGZCx/OcECMWfz7tVwQ8e+Opy6rA==";
};
};
"vue-hot-reload-api-2.3.4" = {
@ -6232,13 +6232,13 @@ let
sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
};
};
"webpack-5.77.0" = {
"webpack-5.80.0" = {
name = "webpack";
packageName = "webpack";
version = "5.77.0";
version = "5.80.0";
src = fetchurl {
url = "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz";
sha512 = "sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==";
url = "https://registry.npmjs.org/webpack/-/webpack-5.80.0.tgz";
sha512 = "OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==";
};
};
"webpack-bundle-analyzer-4.8.0" = {
@ -6268,13 +6268,13 @@ let
sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==";
};
};
"webpack-dev-server-4.13.2" = {
"webpack-dev-server-4.13.3" = {
name = "webpack-dev-server";
packageName = "webpack-dev-server";
version = "4.13.2";
version = "4.13.3";
src = fetchurl {
url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.13.2.tgz";
sha512 = "5i6TrGBRxG4vnfDpB6qSQGfnB6skGBXNL5/542w2uRGLimX6qeE5BQMLrzIC3JYV/xlGOv+s+hTleI9AZKUQNw==";
url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.13.3.tgz";
sha512 = "KqqzrzMRSRy5ePz10VhjyL27K2dxqwXQLP5rAKwRJBPUahe7Z2bBWzHw37jeb8GCPKxZRO79ZdQUAPesMh/Nug==";
};
};
"webpack-merge-5.8.0" = {
@ -6597,7 +6597,7 @@ let
sources."ms-2.1.2"
];
})
sources."@eslint/js-8.37.0"
sources."@eslint/js-8.39.0"
sources."@fortawesome/fontawesome-common-types-6.4.0"
sources."@fortawesome/fontawesome-svg-core-6.4.0"
sources."@fortawesome/free-brands-svg-icons-6.4.0"
@ -6614,6 +6614,7 @@ let
sources."@jridgewell/gen-mapping-0.3.2"
sources."@jridgewell/resolve-uri-3.1.0"
sources."@jridgewell/set-array-1.1.2"
sources."@jridgewell/source-map-0.3.3"
sources."@jridgewell/sourcemap-codec-1.4.14"
sources."@jridgewell/trace-mapping-0.3.17"
sources."@leichtgewicht/ip-codec-2.0.3"
@ -6628,7 +6629,7 @@ let
sources."@types/connect-history-api-fallback-1.3.5"
sources."@types/eslint-8.2.2"
sources."@types/eslint-scope-3.7.3"
sources."@types/estree-0.0.51"
sources."@types/estree-1.0.0"
sources."@types/express-4.17.13"
sources."@types/express-serve-static-core-4.17.27"
sources."@types/glob-7.1.4"
@ -6653,21 +6654,21 @@ let
sources."postcss-7.0.39"
];
})
sources."@webassemblyjs/ast-1.11.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
sources."@webassemblyjs/helper-api-error-1.11.1"
sources."@webassemblyjs/helper-buffer-1.11.1"
sources."@webassemblyjs/helper-numbers-1.11.1"
sources."@webassemblyjs/helper-wasm-bytecode-1.11.1"
sources."@webassemblyjs/helper-wasm-section-1.11.1"
sources."@webassemblyjs/ieee754-1.11.1"
sources."@webassemblyjs/leb128-1.11.1"
sources."@webassemblyjs/utf8-1.11.1"
sources."@webassemblyjs/wasm-edit-1.11.1"
sources."@webassemblyjs/wasm-gen-1.11.1"
sources."@webassemblyjs/wasm-opt-1.11.1"
sources."@webassemblyjs/wasm-parser-1.11.1"
sources."@webassemblyjs/wast-printer-1.11.1"
sources."@webassemblyjs/ast-1.11.5"
sources."@webassemblyjs/floating-point-hex-parser-1.11.5"
sources."@webassemblyjs/helper-api-error-1.11.5"
sources."@webassemblyjs/helper-buffer-1.11.5"
sources."@webassemblyjs/helper-numbers-1.11.5"
sources."@webassemblyjs/helper-wasm-bytecode-1.11.5"
sources."@webassemblyjs/helper-wasm-section-1.11.5"
sources."@webassemblyjs/ieee754-1.11.5"
sources."@webassemblyjs/leb128-1.11.5"
sources."@webassemblyjs/utf8-1.11.5"
sources."@webassemblyjs/wasm-edit-1.11.5"
sources."@webassemblyjs/wasm-gen-1.11.5"
sources."@webassemblyjs/wasm-opt-1.11.5"
sources."@webassemblyjs/wasm-parser-1.11.5"
sources."@webassemblyjs/wast-printer-1.11.5"
sources."@webpack-cli/configtest-1.2.0"
sources."@webpack-cli/info-1.5.0"
sources."@webpack-cli/serve-1.7.0"
@ -6699,7 +6700,7 @@ let
sources."array.prototype.flatmap-1.3.1"
sources."asynckit-0.4.0"
sources."available-typed-arrays-1.0.5"
sources."axios-1.3.4"
sources."axios-1.3.6"
(sources."babel-loader-9.1.2" // {
dependencies = [
sources."ajv-8.12.0"
@ -6823,18 +6824,18 @@ let
sources."electron-to-chromium-1.4.249"
sources."emojis-list-3.0.0"
sources."encodeurl-1.0.2"
sources."enhanced-resolve-5.10.0"
sources."enhanced-resolve-5.13.0"
sources."entities-2.2.0"
sources."envinfo-7.8.1"
sources."es-abstract-1.21.1"
sources."es-module-lexer-0.9.3"
sources."es-module-lexer-1.2.1"
sources."es-set-tostringtag-2.0.1"
sources."es-shim-unscopables-1.0.0"
sources."es-to-primitive-1.2.1"
sources."escalade-3.1.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
(sources."eslint-8.37.0" // {
(sources."eslint-8.39.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.2"
@ -6842,7 +6843,7 @@ let
sources."color-name-1.1.4"
sources."debug-4.3.4"
sources."escape-string-regexp-4.0.0"
sources."eslint-scope-7.1.1"
sources."eslint-scope-7.2.0"
sources."estraverse-5.3.0"
sources."glob-parent-6.0.2"
sources."globals-13.20.0"
@ -6877,13 +6878,13 @@ let
sources."semver-6.3.0"
];
})
(sources."eslint-plugin-vue-9.10.0" // {
(sources."eslint-plugin-vue-9.11.0" // {
dependencies = [
sources."debug-4.3.4"
sources."eslint-scope-7.1.1"
sources."eslint-scope-7.2.0"
sources."estraverse-5.3.0"
sources."ms-2.1.2"
sources."vue-eslint-parser-9.1.0"
sources."vue-eslint-parser-9.1.1"
];
})
sources."eslint-scope-5.1.1"
@ -6921,12 +6922,8 @@ let
sources."file-entry-cache-6.0.1"
(sources."file-loader-6.2.0" // {
dependencies = [
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."fast-deep-equal-3.1.3"
sources."json5-2.1.3"
sources."loader-utils-2.0.0"
sources."schema-utils-3.0.0"
];
})
sources."fill-range-7.0.1"
@ -6999,7 +6996,7 @@ let
sources."commander-8.3.0"
];
})
sources."html-webpack-plugin-5.5.0"
sources."html-webpack-plugin-5.5.1"
sources."htmlparser2-6.1.0"
sources."http-deceiver-1.2.7"
(sources."http-errors-1.8.1" // {
@ -7224,9 +7221,9 @@ let
sources."safe-buffer-5.1.2"
sources."safe-regex-test-1.0.0"
sources."safer-buffer-2.1.2"
sources."sass-1.60.0"
sources."sass-1.62.0"
sources."sass-loader-13.2.2"
sources."schema-utils-3.1.1"
sources."schema-utils-3.1.2"
sources."select-hose-2.0.0"
sources."selfsigned-2.1.1"
(sources."semver-7.3.8" // {
@ -7241,7 +7238,7 @@ let
sources."ms-2.1.3"
];
})
sources."serialize-javascript-6.0.0"
sources."serialize-javascript-6.0.1"
(sources."serve-index-1.9.1" // {
dependencies = [
sources."http-errors-1.6.3"
@ -7285,9 +7282,8 @@ let
sources."supports-preserve-symlinks-flag-1.0.0"
sources."svg-country-flags-1.2.10"
sources."tapable-2.2.0"
(sources."terser-5.9.0" // {
(sources."terser-5.16.9" // {
dependencies = [
sources."source-map-0.7.3"
(sources."source-map-support-0.5.20" // {
dependencies = [
sources."source-map-0.6.1"
@ -7295,7 +7291,7 @@ let
})
];
})
sources."terser-webpack-plugin-5.3.0"
sources."terser-webpack-plugin-5.3.7"
sources."text-table-0.2.0"
sources."thunky-1.1.0"
sources."to-fast-properties-2.0.0"
@ -7320,12 +7316,8 @@ let
sources."uri-js-4.2.2"
(sources."url-loader-4.1.1" // {
dependencies = [
sources."ajv-6.12.5"
sources."ajv-keywords-3.5.2"
sources."fast-deep-equal-3.1.3"
sources."json5-2.1.3"
sources."loader-utils-2.0.0"
sources."schema-utils-3.0.0"
];
})
sources."util-deprecate-1.0.2"
@ -7356,7 +7348,7 @@ let
sources."vuex-3.6.2"
sources."watchpack-2.4.0"
sources."wbuf-1.7.3"
sources."webpack-5.77.0"
sources."webpack-5.80.0"
(sources."webpack-bundle-analyzer-4.8.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@ -7382,12 +7374,12 @@ let
sources."schema-utils-4.0.0"
];
})
(sources."webpack-dev-server-4.13.2" // {
(sources."webpack-dev-server-4.13.3" // {
dependencies = [
sources."ajv-8.12.0"
sources."ajv-keywords-5.1.0"
sources."json-schema-traverse-1.0.0"
sources."schema-utils-4.0.0"
sources."schema-utils-4.0.1"
];
})
sources."webpack-merge-5.8.0"

6
pkgs/applications/misc/geoipupdate/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "geoipupdate";
version = "5.0.4";
version = "5.1.0";
src = fetchFromGitHub {
owner = "maxmind";
repo = "geoipupdate";
rev = "v${version}";
sha256 = "sha256-jes4MWJh0y5ddWjU/Hp6xwZU7/HUi/q0vF5AYQRBKiE=";
sha256 = "sha256-DYZqvLuPcoek07YJLur/By9Wi2VxDz6C7jAOVmdKt4Y=";
};
vendorHash = "sha256-OnByMNjs6C3R7v5PRDYGYekamsesz9yq2KNsI+NHcQ4=";
vendorHash = "sha256-t6uhFvuR54Q4nYur/3oBzAbBTaIjzHfx7GeEk6X/0os=";
ldflags = [ "-X main.version=${version}" ];

36
pkgs/applications/misc/mainsail/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, stdenvNoCC
, fetchzip
}:
stdenvNoCC.mkDerivation rec {
pname = "mainsail";
version = "2.5.1";
src = fetchzip {
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
hash = "sha256-xdmi1Q2j2gG4ajh57mBsjH3qCBwpsZCQbh0INFKifg4=";
stripRoot = false;
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/mainsail
cp -r ./* $out/share/mainsail
runHook postInstall
'';
meta = with lib; {
description = "Web interface for managing and controlling 3D printers with Klipper";
homepage = "https://docs.mainsail.xyz";
changelog = "https://github.com/mainsail-crew/mainsail/releases/tag/v${version}";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ shhht lovesegfault ];
};
}

6
pkgs/applications/misc/wthrr/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "wthrr";
version = "1.0.2";
version = "1.1.1";
src = fetchFromGitHub {
owner = "tobealive";
repo = "wthrr-the-weathercrab";
rev = "v${version}";
hash = "sha256-iyla63CbsYavPRbkrnqr3gyULyWbvUKc3evKaB/W9jU=";
hash = "sha256-djrPBmXnUC8d6lWuiHyYY2so8/5RHLFYDu6xoHn6GRg=";
};
cargoHash = "sha256-izJ0TT69QnnOTLOGi1bqvy0AHJw1mMI/io5twa2Y4x0=";
cargoHash = "sha256-PGbkGoWcFlTKpnrvMzrHvjFLIuohqEhVg4DYhAZOpkw=";
nativeBuildInputs = [
pkg-config

6
pkgs/applications/misc/zine/default.nix
View File

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "zine";
version = "0.14.0";
version = "0.15.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-ydcrU2nIlu7Jx7S00DZmD2lAwLIFNzfv4zzM4SwJLVc=";
sha256 = "sha256-81aCSIsgi7R4KmH1wvDYJJ1WX1vpT1n20XXSs+pHT54=";
};
cargoHash = "sha256-j87mpWuYOx7oQyUIlvqKeQ/LZ2lRxz4hyPC0TsrgX2g=";
cargoHash = "sha256-QRxh67WKRUukKGbKQHwWYdDSazN+2g/kf2A3BgePOUM=";
nativeBuildInputs = [
pkg-config

6
pkgs/applications/networking/cluster/kops/default.nix
View File

@ -14,7 +14,7 @@ let
inherit sha256;
};
vendorSha256 = null;
vendorHash = null;
nativeBuildInputs = [ installShellFiles ];
@ -62,8 +62,8 @@ rec {
};
kops_1_26 = mkKops rec {
version = "1.26.2";
sha256 = "sha256-PY/dcKyciPg3OyUPeBwYed6ADprpI2/+8d8SuGTXWqc=";
version = "1.26.3";
sha256 = "sha256-8IQbVFqH5r8H7z7U441Aox4yp3KF/sqs3+JpMru8qwQ=";
rev = "v${version}";
};
}

4
pkgs/applications/networking/cluster/ktunnel/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
let
version = "1.5.2";
version = "1.5.3";
in
buildGoModule {
pname = "ktunnel";
@ -10,7 +10,7 @@ buildGoModule {
owner = "omrikiei";
repo = "ktunnel";
rev = "v${version}";
sha256 = "sha256-QZL3TSvxSPuBjjATAqoAOZNBSB6NCGfHHG2dq8C4Wwk=";
sha256 = "sha256-7SWj9Emm78xpzdvJFKqpI5HVQi0ohbixkgXKGTy5C/A=";
};
ldflags = [

29
pkgs/applications/networking/cluster/kubectl-view-secret/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-view-secret";
version = "0.10.1";
src = fetchFromGitHub {
owner = "elsesiy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+0uHBzT8cocuDttkvNHnmy/WQ+mfVIc0J0fkhBf4PLI=";
};
vendorSha256 = "sha256-A3bB4L4O7j6lnP3c4mF4zVY/fDac6OBM5uKJuCnZR9g=";
subPackages = [ "./cmd/" ];
postInstall = ''
mv $out/bin/cmd $out/bin/kubectl-view-secret
'';
meta = with lib; {
description = "Kubernetes CLI plugin to decode Kubernetes secrets";
homepage = "https://github.com/elsesiy/kubectl-view-secret";
changelog = "https://github.com/elsesiy/kubectl-view-secret/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ maintainers.sagikazarmark ];
};
}

4
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -1044,11 +1044,11 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-KC7A7BgGF2erEZKW/hTiveZB0GaCAkzpmkbsF21Ihsg=",
"hash": "sha256-RrnDjmzQIOR/dZjiNMqL4fw4nayLZrsaD5mtg+3OWMU=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.115.0",
"rev": "v1.116.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-6ZxurzzOa/1TXOApQNLFUrY+Ryxc7n+JwZG76JuePGc="
},

32
pkgs/applications/networking/feedreaders/russ/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, xorg
}:
rustPlatform.buildRustPackage {
pname = "russ";
version = "0.4.0";
src = fetchFromGitHub {
owner = "ckampfe";
repo = "russ";
rev = "1482bb1df13738fdd4ea1badf2146a9ed8e6656e";
hash = "sha256-MvTMo2q/cQ/LQNdUV8SmHgGlA42kLl0i9mdcoAFV/I4=";
};
cargoHash = "sha256-ObWrwXMGXkLqqM7VXhOXArshk2lVkbOTXhrQImDQp1s=";
# tests are network based :(
doCheck = false;
meta = with lib; {
description = "A TUI RSS reader with vim-like controls and a local-first, offline-first focus";
homepage = "https://github.com/ckampfe/russ";
license = with licenses; [ agpl3Only ];
maintainers = with maintainers; [ blusk ];
changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md";
broken = stdenv.isDarwin;
};
}

4
pkgs/applications/networking/instant-messengers/chatterino2/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "chatterino2";
version = "2.4.2";
version = "2.4.3";
src = fetchFromGitHub {
owner = "Chatterino";
repo = pname;
rev = "v${version}";
sha256 = "sha256-d/rsY4pgPpA4JcMmoD6AG1DzHovfSERaeuYkMY603kA=";
sha256 = "sha256-M8WTgZv3+8SRGNfxCv10GldjgRYBUVo1B3X4s+QAuYs=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@ -1,7 +1,7 @@
{ branch ? "stable", callPackage, fetchurl, lib, stdenv }:
let
versions = if stdenv.isLinux then {
stable = "0.0.26";
stable = "0.0.27";
ptb = "0.0.42";
canary = "0.0.151";
development = "0.0.216";
@ -16,7 +16,7 @@ let
x86_64-linux = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "sha256-MPdNxZJBmIN4NGEoYWvL2cmNm37/YT275m2bVWHXbwY=";
sha256 = "sha256-6fHaiPBcv7TQVh+TatIEYXZ/LwPmnCmU/QWXKFgUR7U=";
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

4
pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wee-slack";
version = "2.9.0";
version = "2.9.1";
src = fetchFromGitHub {
repo = "wee-slack";
owner = "wee-slack";
rev = "v${version}";
sha256 = "sha256-WMZo+X8G/Dnl1Vv0LuBYcvxdfll9cy/3Z/fpNJSxCQY=";
sha256 = "sha256-f5CRJmvNZlKOE1XsU214R42dYo0s5xSRXC8TKOniEf4=";
};
patches = [

6
pkgs/applications/networking/localsend/default.nix
View File

@ -2,16 +2,16 @@
let
pname = "localsend";
version = "1.9.0";
version = "1.9.1";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
hash = "sha256-i5/haQHsw3BAOFGsHO41oiop1JgMISTr1Dw0tAeYupU=";
hash = "sha256-YAhGkJwDno8GeOepyokHv068IhY8H+L88VrKP76VHjU=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
hash = "sha256-Ibojcg5To288c+v6IKMOjuLz970osiKJU7/K0VnIs8k=";
hash = "sha256-GXyFSsTK3S8nhwixDgZTQEwRt3SOcsnbARzb/BhTk8w=";
};
};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -83,6 +83,10 @@ stdenv.mkDerivation rec {
in ''
mkdir -p test/test-databases
ln -s ${test-database} test/test-databases/database-v1.tar.xz
''
# Issues since gnupg: 2.4.0 -> 2.4.1
+ ''
rm test/{T350-crypto,T357-index-decryption}.sh
'';
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");

4
pkgs/applications/office/appflowy/default.nix
View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
version = "0.1.3";
version = "0.1.4";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
sha256 = "sha256-dZqnwROrw3ioCzUNvpklGOCr5cyjXU1Iqkp6xBdr3rA=";
sha256 = "sha256-hNk1sypMZYZA1s3rQyaOY5J829PWo2b9Q/VCDcfRKPM=";
stripRoot = false;
};

24
pkgs/applications/science/biology/kent/default.nix
View File

@ -43,22 +43,22 @@ stdenv.mkDerivation rec {
export CFLAGS="-fPIC"
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
export MYSQLLIBS=$(mysql_config --libs)
export DESTBINDIR=$NIX_BUILD_TOP/bin
export HOME=$NIX_BUILD_TOP
export HOME=$TMPDIR
export DESTBINDIR=$HOME/bin
mkdir -p $HOME/lib $HOME/bin/x86_64
cd ./src
chmod +x ./checkUmask.sh
./checkUmask.sh
mkdir -p $NIX_BUILD_TOP/lib
mkdir -p $NIX_BUILD_TOP/bin/x86_64
make libs
cd jkOwnLib
make
cp ../lib/x86_64/jkOwnLib.a $NIX_BUILD_TOP/lib
cp ../lib/x86_64/jkweb.a $NIX_BUILD_TOP/lib
cp ../lib/x86_64/jkOwnLib.a $HOME/lib
cp ../lib/x86_64/jkweb.a $HOME/lib
cp -r ../inc $HOME/
cd ../utils
make
@ -69,11 +69,11 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mkdir -p $out/lib
cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib
cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib
cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin
mkdir -p $out/bin $out/lib $out/inc
cp $HOME/lib/jkOwnLib.a $out/lib
cp $HOME/lib/jkweb.a $out/lib
cp $HOME/bin/x86_64/* $out/bin
cp -r $HOME/inc/* $out/inc/
runHook postInstall
'';

4
pkgs/applications/science/math/4ti2/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec{
pname = "4ti2";
version = "1.6.9";
version = "1.6.10";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "Release_${builtins.replaceStrings ["."] ["_"] version}";
hash = "sha256-cywneIM0sHt1iQsNfjyQDoDfdRjxpz4l3rfysi9YN20=";
hash = "sha256-Rz8O1Tf81kzpTGPq7dkZJvv444F1/VqKu7VuRvH59kQ=";
};
nativeBuildInputs = [

6
pkgs/applications/version-management/mercurial/default.nix
View File

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.4.2";
version = "6.4.3";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-W59qPDX05GlchU73FCjPlGHKGlKfaRwG3G97SOe7MzU=";
sha256 = "sha256-p3+2LTJZNKg6ALL8bbEJ9ExnuGdo/EBJA2b1E2QMf2Q=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-dRajIqM91fESEm4EEa9qvS8h6/HlLZIJZztVGoS/G+M=";
sha256 = "sha256-nm9RZZHtmPfeJ7StHZmfxcFqKeJHACQQeA/Evv3wYD8=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;

4
pkgs/applications/video/mpv/scripts/mpris.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mpv-mpris";
version = "0.9";
version = "1.0";
src = fetchFromGitHub {
owner = "hoyon";
repo = "mpv-mpris";
rev = version;
sha256 = "sha256-leW7oCWTnJuprVnJJ+iXd3nuB2VXl3fw8FmPxv7d6rA=";
sha256 = "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4=";
};
nativeBuildInputs = [ pkg-config ];

8
pkgs/applications/video/obs-studio/plugins/default.nix
View File

@ -14,8 +14,12 @@
looking-glass-obs = callPackage ./looking-glass-obs.nix { };
obs-3d-effect = callPackage ./obs-3d-effect.nix { };
obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
obs-command-source = callPackage ./obs-command-source.nix { };
obs-gstreamer = callPackage ./obs-gstreamer.nix { };
obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { };
@ -32,6 +36,8 @@
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };
obs-shaderfilter = qt6Packages.callPackage ./obs-shaderfilter.nix { };
obs-source-clone = callPackage ./obs-source-clone.nix { };
obs-source-record = callPackage ./obs-source-record.nix { };
@ -40,6 +46,8 @@
obs-vaapi = callPackage ./obs-vaapi { };
obs-vintage-filter = callPackage ./obs-vintage-filter.nix { };
obs-vkcapture = callPackage ./obs-vkcapture.nix {
obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture;
};

37
pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-3d-effect";
version = "0.0.2";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-3d-effect";
rev = version;
sha256 = "sha256-1frLQo+0/HxTIkZ57rnQjVOos5+bv2cLojslSCGo+gU=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
postInstall = ''
rm -rf $out/obs-plugins $out/data
'';
meta = with lib; {
description = "Plugin for OBS Studio adding 3D effect filter";
homepage = "https://github.com/exeldro/obs-3d-effect";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

36
pkgs/applications/video/obs-studio/plugins/obs-command-source.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-command-source";
version = "0.4.0";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-command-source";
rev = version;
sha256 = "sha256-rBGMQb7iGtxF54bBOK5lHI6VFYCSEyeSq2Arz0T0DPo=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
postInstall = ''
mkdir $out/lib $out/share
mv $out/obs-plugins/64bit $out/lib/obs-plugins
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
'';
meta = with lib; {
description = "OBS Studio plugin that provides a dummy source to execute arbitrary commands when a scene is switched.";
homepage = "https://github.com/norihiro/command-source";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

41
pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
, qtbase
}:
stdenv.mkDerivation rec {
pname = "obs-shaderfilter";
version = "v1.22";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-shaderfilter";
rev = version;
sha256 = "sha256-CqqYzGRhlHO8Zva+so8uo9+EIlzTfoFVl3NzZMsE7Xc=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio qtbase ];
cmakeFlags = [
"-DBUILD_OUT_OF_TREE=On"
];
dontWrapQtApps = true;
postInstall = ''
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
'';
meta = with lib; {
description = "OBS Studio filter for applying an arbitrary shader to a source.";
homepage = "https://github.com/exeldro/obs-shaderfilter";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

36
pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, obs-studio
}:
stdenv.mkDerivation rec {
pname = "obs-vintage-filter";
version = "1.0.0";
src = fetchFromGitHub {
owner = "cg2121";
repo = "obs-vintage-filter";
rev = version;
sha256 = "sha256-K7AxvwVLe4G+75aY430lygSRB7rMtsGi17pGzdygEac=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
postInstall = ''
mkdir $out/lib $out/share
mv $out/obs-plugins/64bit $out/lib/obs-plugins
rm -rf $out/obs-plugins
mv $out/data $out/share/obs
'';
meta = with lib; {
description = "An OBS Studio filter where the source can be set to be black & white or sepia.";
homepage = "https://github.com/cg2121/obs-vintage-filter";
maintainers = with maintainers; [ flexiondotorg ];
license = licenses.gpl2Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

12
pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
View File

@ -4,15 +4,15 @@
, meson
, ninja
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland-protocols";
version = "unstable-2023-01-13";
version = "0.2";
src = fetchFromGitHub {
owner = "hyprwm";
repo = pname;
rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90";
hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=";
};
nativeBuildInputs = [
@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ fufexan ];
platforms = lib.platforms.linux;
};
}
})

18
pkgs/applications/window-managers/hyprwm/hyprland/default.nix
View File

@ -36,27 +36,27 @@ let
'';
in
assert assertXWayland;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hyprland" + lib.optionalString debug "-debug";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprland";
rev = "v${version}";
hash = "sha256-zbtxX0NezuNg46PAKscmDfFfNID4rAq2qGNf1BE3Cqc=";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-Npf48UUfywneFYGEc7NQ59xudwvw7EJjwweT4tHguIY=";
};
patches = [
# make meson use the provided dependencies instead of the git submodules
"${src}/nix/meson-build.patch"
"${finalAttrs.src}/nix/meson-build.patch"
];
postPatch = ''
# Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
substituteInPlace meson.build \
--replace "@GIT_COMMIT_HASH@" '${version}' \
--replace "@GIT_COMMIT_HASH@" '${finalAttrs.src.rev}' \
--replace "@GIT_DIRTY@" ""
'';
@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
outputs = [
"out"
"man"
"dev"
];
buildInputs =
@ -103,7 +104,6 @@ stdenv.mkDerivation rec {
(lib.optional withSystemd "-Dsystemd=enabled")
];
passthru.providedSessions = [ "hyprland" ];
meta = with lib; {
@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
mainProgram = "Hyprland";
platforms = wlroots.meta.platforms;
};
}
})

4
pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
View File

@ -49,8 +49,8 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = "7abda952d0000b72d240fe1d41457b9288f0b6e5";
hash = "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=";
rev = "6830bfc17fd94709e2cdd4da0af989f102a26e59";
hash = "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=";
};
pname =

8
pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprpaper";
version = "unstable-2023-04-05";
version = "0.1.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprpaper";
rev = "9182de9ffc8c76fbf24d16dec0ea7a9430597a06";
hash = "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=";
};
nativeBuildInputs = [

10
pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
View File

@ -21,14 +21,14 @@
, libXdmcp
, debug ? false
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "hyprpicker" + lib.optionalString debug "-debug";
version = "unstable-2023-03-31";
version = "0.1.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprpicker";
rev = "cc6b3234b2966acd61c8a2e5caae947774666601";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-8Tc8am5+iQvzRdnTYIpD3Ewge6TIctrm8tr0H+RvcsE=";
};
@ -92,4 +92,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ fufexan ];
platforms = wayland.meta.platforms;
};
}
})

2
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
View File

@ -9,6 +9,7 @@
, hyprland-share-picker
, inih
, libdrm
, libuuid
, mesa
, pipewire
, systemd
@ -36,6 +37,7 @@ stdenv.mkDerivation {
hyprland-protocols
inih
libdrm
libuuid
mesa
pipewire
systemd

9
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
View File

@ -2,14 +2,17 @@
, fetchFromGitHub
, wayland
}:
let
version = "0.3.1";
in
{
version = "unstable-2023-04-06";
inherit version;
src = fetchFromGitHub {
owner = "hyprwm";
repo = "xdg-desktop-portal-hyprland";
rev = "803c00db1191604d50766358dbc5be2de4fcb4e7";
hash = "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=";
rev = "v${version}";
hash = "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=";
};
meta = with lib; {

4
pkgs/applications/window-managers/icewm/default.nix
View File

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.3.3";
version = "3.3.4";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-VcUc1T3uTj8fhSZ+/XWRzgoenjqA/gguxuNsj+PYzB0=";
hash = "sha256-Ygu10QF+cbjA0qy3k8/A9QX5xSthXcPy0wII3tXLH68=";
};
nativeBuildInputs = [

10
pkgs/build-support/bintools-wrapper/ld-wrapper.sh
View File

@ -55,10 +55,12 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"
# produces '-syslibroot //' linker flag. It's a no-op,
# which does not introduce impurities.
n+=1; skip "$p2"
elif [ "${p:0:1}" = / ] && badPath "$p"; then
# We cannot skip this; barf.
echo "impure path \`$p' used in link" >&2
exit 1
elif [ "${p:0:10}" = /LIBPATH:/ ] && badPath "${p:9}"; then
reject "${p:9}"
# We need to not match LINK.EXE-style flags like
# /NOLOGO or /LIBPATH:/nix/store/foo
elif [[ $p =~ ^/[^:]*/ ]] && badPath "$p"; then
reject "$p"
elif [ "${p:0:9}" = --sysroot ]; then
# Our ld is not built with sysroot support (Can we fix that?)
:

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -518,7 +518,7 @@ stdenv.mkDerivation {
''
# TODO: categorize these and figure out a better place for them
+ optionalString hostPlatform.isCygwin ''
+ optionalString targetPlatform.isWindows ''
hardening_unsupported_flags+=" pic"
'' + optionalString targetPlatform.isMinGW ''
hardening_unsupported_flags+=" stackprotector fortify"

4
pkgs/build-support/fetchbitbucket/default.nix
View File

@ -1,5 +1,6 @@
{ fetchzip }:
{ fetchzip, lib }:
lib.makeOverridable (
{ owner, repo, rev, name ? "source"
, ... # For hash agility
}@args: fetchzip ({
@ -7,3 +8,4 @@
url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
} // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }
)

4
pkgs/build-support/fetchcvs/default.nix
View File

@ -3,8 +3,9 @@
# tag="<tagname>" (get version by tag name)
# If you don't specify neither one date="NOW" will be used (get latest)
{stdenvNoCC, cvs, openssh}:
{stdenvNoCC, cvs, openssh, lib}:
lib.makeOverridable (
{cvsRoot, module, tag ? null, date ? null, sha256}:
stdenvNoCC.mkDerivation {
@ -18,3 +19,4 @@ stdenvNoCC.mkDerivation {
inherit cvsRoot module sha256 tag date;
}
)

4
pkgs/build-support/fetchdarcs/default.nix
View File

@ -1,5 +1,6 @@
{stdenvNoCC, darcs, cacert}:
{stdenvNoCC, darcs, cacert, lib}:
lib.makeOverridable (
{ url
, rev ? null
, context ? null
@ -21,3 +22,4 @@ stdenvNoCC.mkDerivation {
inherit url rev context name;
}
)

2
pkgs/build-support/fetchgit/default.nix
View File

@ -10,6 +10,7 @@
appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${short}";
in "${if matched == null then base else builtins.head matched}${appendShort}";
in
lib.makeOverridable (
{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone
, fetchSubmodules ? true, deepClone ? false
, branchName ? null
@ -107,3 +108,4 @@ stdenvNoCC.mkDerivation {
gitRepoUrl = url;
};
}
)

2
pkgs/build-support/fetchgitea/default.nix
View File

@ -2,6 +2,8 @@
{ lib, fetchFromGitHub }:
lib.makeOverridable (
{ domain, ... }@args:
fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; })
)

2
pkgs/build-support/fetchgithub/default.nix
View File

@ -1,5 +1,6 @@
{ lib, fetchgit, fetchzip }:
lib.makeOverridable (
{ owner, repo, rev, name ? "source"
, fetchSubmodules ? false, leaveDotGit ? null
, deepClone ? false, private ? false, forceFetchGit ? false
@ -60,3 +61,4 @@ let
in
fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; }
)

2
pkgs/build-support/fetchgitiles/default.nix
View File

@ -1,5 +1,6 @@
{ fetchzip, lib }:
lib.makeOverridable (
{ url, rev, name ? "source", ... } @ args:
fetchzip ({
@ -8,3 +9,4 @@ fetchzip ({
stripRoot = false;
meta.homepage = url;
} // removeAttrs args [ "url" "rev" ]) // { inherit rev; }
)

2
pkgs/build-support/fetchgitlab/default.nix
View File

@ -1,5 +1,6 @@
{ fetchgit, fetchzip, lib }:
lib.makeOverridable (
# gitlab example
{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null
, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false
@ -30,3 +31,4 @@ let
in
fetcher fetcherArgs // { meta.homepage = "${protocol}://${domain}/${slug}/"; inherit rev; }
)

6
pkgs/build-support/fetchgitlocal/default.nix
View File

@ -1,4 +1,7 @@
{ runCommand, git }: src:
{ runCommand, git, lib }:
lib.makeOverridable (
src:
let
srcStr = toString src;
@ -38,3 +41,4 @@ let
'';
in nixPath
)

4
pkgs/build-support/fetchsavannah/default.nix
View File

@ -1,5 +1,6 @@
{ fetchzip }:
{ fetchzip, lib }:
lib.makeOverridable (
# cgit example, snapshot support is optional in cgit
{ repo, rev, name ? "source"
, ... # For hash agility
@ -8,3 +9,4 @@
url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/";
} // removeAttrs args [ "repo" "rev" ]) // { inherit rev; }
)

2
pkgs/build-support/fetchsourcehut/default.nix
View File

@ -1,5 +1,6 @@
{ fetchgit, fetchhg, fetchzip, lib }:
lib.makeOverridable (
{ owner
, repo, rev
, domain ? "sr.ht"
@ -48,3 +49,4 @@ in cases.${fetcher}.fetch cases.${fetcher}.arguments // {
inherit rev;
meta.homepage = "${baseUrl}";
}
)

2
pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh
View File

@ -67,7 +67,7 @@ wrapProgramBinary() {
hidden="${hidden}_"
done
mv "$prog" "$hidden"
makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
makeBinaryWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
}
# Generate source code for the wrapper in such a way that the wrapper inputs

2
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -217,5 +217,5 @@ wrapProgramShell() {
hidden="${hidden}_"
done
mv "$prog" "$hidden"
makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
makeShellWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"
}

7
pkgs/build-support/wrapper-common/utils.bash
View File

@ -84,12 +84,17 @@ mangleVarSingle() {
done
}
skip () {
skip() {
if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo "skipping impure path $1" >&2
fi
}
reject() {
echo "impure path \`$1' used in link" >&2
exit 1
}
# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but
# `/nix/store/.../lib/foo.so' isn't.

89
pkgs/desktops/gnome/extensions/extensions.json
View File

File diff suppressed because one or more lines are too long

1
pkgs/desktops/gnome/extensions/manuallyPackaged.nix
View File

@ -18,5 +18,6 @@
"taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { };
"tilingnome@rliang.github.com" = callPackage ./tilingnome { };
"TopIcons@phocean.net" = callPackage ./topicons-plus { };
"valent@andyholmes.ca" = callPackage ./valent { };
"window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { };
}

37
pkgs/desktops/gnome/extensions/valent/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv
, lib
, fetchFromGitHub
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-valent";
version = "unstable-2023-03-18";
src = fetchFromGitHub {
owner = "andyholmes";
repo = "gnome-shell-extension-valent";
rev = "e7f759047c45833cd211ef18a8554008cb1b8b12";
hash = "sha256-ylCyQbFbzCuSM2YrLuI36eXL2qQjTt1mYewJlCywKvI=";
};
nativeBuildInputs = [
meson
ninja
];
passthru = {
extensionUuid = "valent@andyholmes.ca";
extensionPortalSlug = "valent";
};
meta = with lib; {
description = "GNOME Shell integration for Valent";
homepage = "https://valent.andyholmes.ca/";
changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = [ maintainers.federicoschonborn ];
platforms = platforms.linux;
};
}

4
pkgs/desktops/mate/mate-session-manager/default.nix
View File

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "mate-session-manager";
version = "1.26.0";
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05hqi8wlwjr07mp5njhp7h06mgnv98zsxaxkmxc5w3iwb3va45ar";
sha256 = "W4x9ZEH9nCk8hjiCq2enSTxTzfZOqyfAlFdfQj69Qng=";
};
patches = [

4
pkgs/development/compilers/glslang/default.nix
View File

@ -10,12 +10,12 @@
}:
stdenv.mkDerivation rec {
pname = "glslang";
version = "1.3.243.0";
version = "12.1.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "sdk-${version}";
rev = version;
hash = "sha256-U45/7G02o82EP4zh7i2Go0VCnsO1B7vxDwIokjyo5Rk=";
};

6
pkgs/development/compilers/llvm/10/compiler-rt/default.nix
View File

@ -40,8 +40,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -90,6 +88,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/10/default.nix
View File

@ -102,7 +102,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

4
pkgs/development/compilers/llvm/11/compiler-rt/default.nix
View File

@ -41,8 +41,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (!haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM || isNewDarwinBootstrap) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -75,6 +73,8 @@ stdenv.mkDerivation {
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
cmakeFlagsArray+=("-DCMAKE_LIPO=$(command -v ${stdenv.cc.targetPrefix}lipo)")
'' + lib.optionalString (!haveLibc) ''
cmakeFlagsArray+=("-DCMAKE_C_FLAGS=-nodefaultlibs -ffreestanding")
'';
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

3
pkgs/development/compilers/llvm/11/default.nix
View File

@ -117,7 +117,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/12/compiler-rt/default.nix
View File

@ -42,8 +42,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -93,6 +91,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/12/default.nix
View File

@ -105,7 +105,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/13/compiler-rt/default.nix
View File

@ -46,8 +46,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -100,6 +98,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/13/default.nix
View File

@ -106,7 +106,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/14/compiler-rt/default.nix
View File

@ -54,8 +54,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -109,6 +107,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/14/default.nix
View File

@ -107,7 +107,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/15/compiler-rt/default.nix
View File

@ -54,8 +54,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -108,6 +106,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/15/default.nix
View File

@ -155,7 +155,8 @@ in let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

3
pkgs/development/compilers/llvm/5/default.nix
View File

@ -77,7 +77,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

3
pkgs/development/compilers/llvm/6/default.nix
View File

@ -78,7 +78,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/7/compiler-rt/default.nix
View File

@ -38,8 +38,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -84,6 +82,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/7/default.nix
View File

@ -109,7 +109,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/8/compiler-rt/default.nix
View File

@ -38,8 +38,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -84,6 +82,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/8/default.nix
View File

@ -110,7 +110,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

6
pkgs/development/compilers/llvm/9/compiler-rt/default.nix
View File

@ -38,8 +38,6 @@ stdenv.mkDerivation {
"-DCMAKE_CXX_COMPILER_WORKS=ON"
"-DCOMPILER_RT_BAREMETAL_BUILD=ON"
"-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
] ++ lib.optionals (useLLVM && !haveLibc) [
"-DCMAKE_C_FLAGS=-nodefaultlibs"
] ++ lib.optionals (useLLVM) [
"-DCOMPILER_RT_BUILD_BUILTINS=ON"
#https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@ -87,6 +85,10 @@ stdenv.mkDerivation {
--replace "#include <assert.h>" ""
'';
preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
'';
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
ln -s "$out/lib"/*/* "$out/lib"

3
pkgs/development/compilers/llvm/9/default.nix
View File

@ -110,7 +110,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
/**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc
else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;

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