Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2024-02-07 00:12:13 +00:00 committed by GitHub
commit 28d39db400
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
229 changed files with 6368 additions and 6863 deletions

4
.github/CODEOWNERS vendored
View file

@ -67,8 +67,8 @@
/nixos/lib/make-disk-image.nix @raitobezarius
# Nix, the package manager
pkgs/tools/package-management/nix/ @raitobezarius
nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius
pkgs/tools/package-management/nix/ @raitobezarius @ma27
nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27
# Nixpkgs documentation
/maintainers/scripts/db-to-md.sh @jtojnar @ryantm

View file

@ -2329,6 +2329,12 @@
fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02";
}];
};
benhiemer = {
name = "Benedikt Hiemer";
email = "ben.email@posteo.de";
github = "benhiemer";
githubId = 16649926;
};
benjaminedwardwebb = {
name = "Ben Webb";
email = "benjaminedwardwebb@gmail.com";
@ -4948,6 +4954,14 @@
fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D";
}];
};
donteatoreo = {
name = "DontEatOreo";
github = "DontEatOreo";
githubId = 57304299;
keys = [{
fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB";
}];
};
doriath = {
email = "tomasz.zurkowski@gmail.com";
github = "doriath";
@ -6684,6 +6698,12 @@
githubId = 293586;
name = "Adam Gamble";
};
gangaram = {
email = "Ganga.Ram@tii.ae";
github = "gangaram-tii";
githubId = 131853076;
name = "Ganga Ram";
};
garaiza-93 = {
email = "araizagustavo93@gmail.com";
github = "garaiza-93";
@ -19149,6 +19169,7 @@
tomasajt = {
github = "TomaSajt";
githubId = 62384384;
matrix = "@tomasajt:matrix.org";
name = "TomaSajt";
keys = [{
fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1";

View file

@ -121,3 +121,4 @@ toml,,,,,,mrcjkb
toml-edit,,,,,5.1,mrcjkb
vstruct,https://github.com/ToxicFrog/vstruct.git,,,,,
vusted,,,,,,figsoda
xml2lua,,,,,,teto

1 name src ref server version luaversion maintainers
121 toml-edit 5.1 mrcjkb
122 vstruct https://github.com/ToxicFrog/vstruct.git
123 vusted figsoda
124 xml2lua teto

View file

@ -219,6 +219,7 @@
./programs/msmtp.nix
./programs/mtr.nix
./programs/nano.nix
./programs/nautilus-open-any-terminal.nix
./programs/nbd.nix
./programs/neovim.nix
./programs/nethoscope.nix

View file

@ -22,7 +22,7 @@ let
serverOptions = { name, config, ... }: {
freeformType = attrsOf (either scalarType (listOf scalarType));
# Client system-options file directives are explained here:
# https://www.ibm.com/docs/en/storage-protect/8.1.20?topic=commands-processing-options
# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=commands-processing-options
options.servername = mkOption {
type = servernameType;
default = name;

View file

@ -545,12 +545,14 @@ let
};
server = mkOption {
type = types.nullOr types.str;
inherit (defaultAndText "server" null) default defaultText;
type = types.str;
inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText;
example = "https://acme-staging-v02.api.letsencrypt.org/directory";
description = lib.mdDoc ''
ACME Directory Resource URI. Defaults to Let's Encrypt's
production endpoint,
<https://acme-v02.api.letsencrypt.org/directory>, if unset.
ACME Directory Resource URI.
Defaults to Let's Encrypt's production endpoint.
For testing Let's Encrypt's [staging endpoint](https://letsencrypt.org/docs/staging-environment/)
should be used to avoid the rather tight rate limit on the production endpoint.
'';
};

View file

@ -90,7 +90,7 @@ in
environment.HOME = "/var/lib/tsm-backup";
serviceConfig = {
# for exit status description see
# https://www.ibm.com/docs/en/storage-protect/8.1.20?topic=clients-client-return-codes
# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=clients-client-return-codes
SuccessExitStatus = "4 8";
# The `-se` option must come after the command.
# The `-optfile` option suppresses a `dsm.opt`-not-found warning.

View file

@ -174,9 +174,8 @@ in
'')
(optionalString cfg.genCfsslAPIToken ''
if [ ! -f "${cfsslAPITokenPath}" ]; then
head -c ${toString (cfsslAPITokenLength / 2)} /dev/urandom | od -An -t x | tr -d ' ' >"${cfsslAPITokenPath}"
install -u cfssl -m 400 <(head -c ${toString (cfsslAPITokenLength / 2)} /dev/urandom | od -An -t x | tr -d ' ') "${cfsslAPITokenPath}"
fi
chown cfssl "${cfsslAPITokenPath}" && chmod 400 "${cfsslAPITokenPath}"
'')]);
systemd.services.kube-certmgr-bootstrap = {
@ -194,7 +193,7 @@ in
if [ -f "${cfsslAPITokenPath}" ]; then
ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}"
else
touch "${certmgrAPITokenPath}" && chmod 600 "${certmgrAPITokenPath}"
install -m 600 /dev/null "${certmgrAPITokenPath}"
fi
''
(optionalString (cfg.pkiTrustOnBootstrap) ''
@ -297,8 +296,7 @@ in
exit 1
fi
echo $token > ${certmgrAPITokenPath}
chmod 600 ${certmgrAPITokenPath}
install -m 0600 <(echo $token) ${certmgrAPITokenPath}
echo "Restarting certmgr..." >&1
systemctl restart certmgr

View file

@ -17,7 +17,7 @@ let
cfg = config.services.frigate;
format = pkgs.formats.yaml {};
format = pkgs.formats.yaml { };
filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! lib.elem v [ null ])) cfg.settings;
@ -112,7 +112,7 @@ in
};
};
};
default = {};
default = { };
description = mdDoc ''
Frigate configuration as a nix attribute set.
@ -125,7 +125,7 @@ in
config = mkIf cfg.enable {
services.nginx = {
enable =true;
enable = true;
additionalModules = with pkgs.nginxModules; [
secure-token
rtmp
@ -133,31 +133,64 @@ in
];
recommendedProxySettings = mkDefault true;
recommendedGzipSettings = mkDefault true;
mapHashBucketSize = mkDefault 128;
upstreams = {
frigate-api.servers = {
"127.0.0.1:5001" = {};
"127.0.0.1:5001" = { };
};
frigate-mqtt-ws.servers = {
"127.0.0.1:5002" = {};
"127.0.0.1:5002" = { };
};
frigate-jsmpeg.servers = {
"127.0.0.1:8082" = {};
"127.0.0.1:8082" = { };
};
frigate-go2rtc.servers = {
"127.0.0.1:1984" = {};
"127.0.0.1:1984" = { };
};
};
# Based on https://github.com/blakeblackshear/frigate/blob/v0.12.0/docker/rootfs/usr/local/nginx/conf/nginx.conf
proxyCachePath."frigate" = {
enable = true;
keysZoneSize = "10m";
keysZoneName = "frigate_api_cache";
maxSize = "10m";
inactive = "1m";
levels = "1:2";
};
# Based on https://github.com/blakeblackshear/frigate/blob/v0.13.1/docker/main/rootfs/usr/local/nginx/conf/nginx.conf
virtualHosts."${cfg.hostname}" = {
locations = {
"/api/" = {
proxyPass = "http://frigate-api/";
extraConfig = ''
proxy_cache frigate_api_cache;
proxy_cache_lock on;
proxy_cache_use_stale updating;
proxy_cache_valid 200 5s;
proxy_cache_bypass $http_x_cache_bypass;
proxy_no_cache $should_not_cache;
add_header X-Cache-Status $upstream_cache_status;
location /api/vod/ {
proxy_pass http://frigate-api/vod/;
proxy_cache off;
}
location /api/stats {
access_log off;
rewrite ^/api/(.*)$ $1 break;
proxy_pass http://frigate-api;
}
location /api/version {
access_log off;
rewrite ^/api/(.*)$ $1 break;
proxy_pass http://frigate-api;
}
'';
};
"~* /api/.*\.(jpg|jpeg|png)$" = {
proxyPass = "http://frigate-api";
extraConfig = ''
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
rewrite ^/api/(.*)$ $1 break;
'';
};
@ -169,10 +202,6 @@ in
secure_token $args;
secure_token_types application/vnd.apple.mpegurl;
add_header Access-Control-Allow-Headers '*';
add_header Access-Control-Expose-Headers 'Server,range,Content-Length,Content-Range';
add_header Access-Control-Allow-Methods 'GET, HEAD, OPTIONS';
add_header Access-Control-Allow-Origin '*';
add_header Cache-Control "no-store";
expires off;
'';
@ -192,27 +221,64 @@ in
proxyPass = "http://frigate-go2rtc/";
proxyWebsockets = true;
};
# frigate lovelace card uses this path
"/live/mse/api/ws" = {
proxyPass = "http://frigate-go2rtc/api/ws";
proxyWebsockets = true;
extraConfig = ''
limit_except GET {
deny all;
}
'';
};
"/live/webrtc/" = {
proxyPass = "http://frigate-go2rtc/";
proxyWebsockets = true;
};
"/live/webrtc/api/ws" = {
proxyPass = "http://frigate-go2rtc/api/ws";
proxyWebsockets = true;
extraConfig = ''
limit_except GET {
deny all;
}
'';
};
# pass through go2rtc player
"/live/webrtc/webrtc.html" = {
proxyPass = "http://frigate-go2rtc/webrtc.html";
proxyWebsockets = true;
extraConfig = ''
limit_except GET {
deny all;
}
'';
};
"/api/go2rtc/api" = {
proxyPass = "http://frigate-go2rtc/api";
proxyWebsockets = true;
extraConfig = ''
limit_except GET {
deny all;
}
'';
};
# integrationn uses this to add webrtc candidate
"/api/go2rtc/webrtc" = {
proxyPass = "http://frigate-go2rtc/api/webrtc";
proxyWebsockets = true;
extraConfig = ''
limit_except GET {
deny all;
}
'';
};
"/cache/" = {
alias = "/var/cache/frigate/";
};
"/clips/" = {
root = "/var/lib/frigate";
extraConfig = ''
add_header 'Access-Control-Allow-Origin' "$http_origin" always;
add_header 'Access-Control-Allow-Credentials' 'true';
add_header 'Access-Control-Expose-Headers' 'Content-Length';
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' "$http_origin";
add_header 'Access-Control-Max-Age' 1728000;
add_header 'Content-Type' 'text/plain charset=UTF-8';
add_header 'Content-Length' 0;
return 204;
}
types {
video/mp4 mp4;
image/jpeg jpg;
@ -224,17 +290,6 @@ in
"/recordings/" = {
root = "/var/lib/frigate";
extraConfig = ''
add_header 'Access-Control-Allow-Origin' "$http_origin" always;
add_header 'Access-Control-Allow-Credentials' 'true';
add_header 'Access-Control-Expose-Headers' 'Content-Length';
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' "$http_origin";
add_header 'Access-Control-Max-Age' 1728000;
add_header 'Content-Type' 'text/plain charset=UTF-8';
add_header 'Content-Length' 0;
return 204;
}
types {
video/mp4 mp4;
}
@ -315,6 +370,12 @@ in
}
}
'';
appendHttpConfig = ''
map $sent_http_content_type $should_not_cache {
'application/json' 0;
default 1;
}
'';
};
systemd.services.nginx.serviceConfig.SupplementaryGroups = [
@ -325,7 +386,7 @@ in
isSystemUser = true;
group = "frigate";
};
users.groups.frigate = {};
users.groups.frigate = { };
systemd.services.frigate = {
after = [

View file

@ -21,7 +21,7 @@ let
eval "$(${config.systemd.package}/bin/systemctl show -pUID,MainPID photoprism.service | ${pkgs.gnused}/bin/sed "s/UID/ServiceUID/")"
exec ${pkgs.util-linux}/bin/nsenter \
-t $MainPID -m -S $ServiceUID -G $ServiceUID --wdns=${cfg.storagePath} \
exec ${cfg.package}/bin/photoprism "$@"
${cfg.package}/bin/photoprism "$@"
'';
in
{

View file

@ -56,7 +56,9 @@ in {
journald.conf(5)](https://www.freedesktop.org/software/systemd/man/journald.conf.html).
Note that the total amount of logs stored is limited by journald settings
such as `SystemMaxUse`, which defaults to a 4 GB cap.
such as `SystemMaxUse`, which defaults to 10% the file system size
(capped at max 4GB), and `SystemKeepFree`, which defaults to 15% of the
file system size.
It is thus recommended to compute what period of time that you will be
able to store logs for when an application logs at full burst rate.

View file

@ -41,6 +41,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
serviceConfig = {
DynamicUser = true;
ExecStart = "${lib.getBin pkgs.ffmpeg-headless}/bin/ffmpeg -re -f lavfi -i smptebars=size=800x600:rate=10 -f mpegts -listen 1 http://0.0.0.0:8080";
Restart = "always";
};
};
};
@ -51,10 +52,14 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.wait_for_unit("frigate.service")
# Frigate startup
machine.wait_for_open_port(5001)
machine.succeed("curl http://localhost:5001")
# nginx startup
machine.wait_for_open_port(80)
machine.wait_for_file("/var/cache/frigate/test-*.mp4")
machine.succeed("curl http://localhost")
machine.wait_for_file("/var/cache/frigate/test@*.mp4")
'';
})

View file

@ -31,7 +31,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
machine.execute("DSM_LOG=/tmp dsmj -optfile=/dev/null >&2 &")
# does it report the "TCP/IP connection failure" error code?
machine.wait_for_window("IBM Spectrum Protect")
machine.wait_for_window("IBM Storage Protect")
machine.wait_for_text("ANS2610S")
machine.send_key("esc")

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, gtk3, qtbase
, qttools, wrapQtAppsHook }:
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, sox, gtk3
, qtbase, qttools, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "flacon";
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
lame
wavpack
vorbisgain
sox
];
postInstall = ''

View file

@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
zeromq
];
env.CXXFLAGS = "-include cstdint";
# cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
hardeningDisable = [ "format" ];

View file

@ -14,12 +14,12 @@ let
sha256Hash = "sha256-E50Nu0kJNTto+/VcCbbTGjRRIESp1PAs4PGprMyhKPk=";
};
betaVersion = {
version = "2023.2.1.20"; # "Android Studio Iguana | 2023.2.1 Beta 2"
sha256Hash = "sha256-cFEPgFAKkFx0d7PC4fTElTQVrBZMQs0RL3wR+hqTh2I=";
version = "2023.2.1.21"; # "Android Studio Iguana | 2023.2.1 RC 1"
sha256Hash = "sha256-TgBrgwsjJKBi4DfTMbcgmtoYfzQ3KGwn1zdEfKO9Q8k=";
};
latestVersion = {
version = "2023.3.1.7"; # "Android Studio Jellyfish | 2023.3.1 Canary 7"
sha256Hash = "sha256-PnhqSKgxs0XQ5cm/PB11Oms2p1aAibXKe52QC+8lX8c=";
version = "2023.3.1.8"; # "Android Studio Jellyfish | 2023.3.1 Canary 8"
sha256Hash = "sha256-wNduJ8AjLG+2gumFtLXYnzYiGN0sxL8WR2izWB87uMM=";
};
in {
# Attributes are named by their corresponding release channels

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "oed";
version = "7.1";
version = "7.4";
src = fetchFromGitHub {
owner = "ibara";
repo = "oed";
rev = "oed-${version}";
hash = "sha256-ySfw8Xo/dCBd3K3dxWsdPz8gQ+KeXyReIlUo4q5SFCc=";
hash = "sha256-bbV89YhrmL7tOgKly5OfQDRz4QE0UzZrVsmoXiJ7ZZw=";
};
postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''

View file

@ -1633,18 +1633,24 @@ let
mktplcRef = {
publisher = "github";
name = "codespaces";
version = "1.14.8";
sha256 = "sha256-kCgnOODT1KDi9PMWs3CATXESWoHnDRhCIZhEUSkm14o=";
version = "1.16.9";
sha256 = "sha256-Zj1dHz8uBHnRpjnD9tUr8OJILRq9Ty91ePiNq6/Vi7c=";
};
meta = {
description = "VSCode extensions that provides cloud-hosted development environments for any activity";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces";
homepage = "https://github.com/features/codespaces";
license = lib.licenses.unfree;
};
meta = { license = lib.licenses.unfree; };
};
github.copilot = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
name = "copilot";
version = "1.151.659";
sha256 = "sha256-6jz7Nb9SGON7AXL4KJwC4H03la9JqLCX+AyBEvxD4HA=";
version = "1.156.691";
sha256 = "sha256-K7lzwfgqb0gUJAivro/ePaQetM31M+zTBRZMBy92ZuA=";
};
meta = {
@ -1660,8 +1666,8 @@ let
mktplcRef = {
publisher = "github";
name = "copilot-chat";
version = "0.11.2023120102";
sha256 = "sha256-EUegM4sVP/vDikNr4LwnWzhDBSgfxYe6mxnrhSdXhIQ=";
version = "0.12.2024013003"; # latest version compatible with vscode 1.86
sha256 = "sha256-4ArWVFko2T6ze/i+HTdXAioWC7euWCycDsQxFTrEtUw=";
};
meta = {
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";

View file

@ -249,9 +249,9 @@
"gpsp": {
"owner": "libretro",
"repo": "gpsp",
"rev": "9fc117ef5c719047818513c7e394c24371cb1dbd",
"hash": "sha256-6dPuj+uzqSYA2+Jm+G3u0HEeBFW2i+KmWd3PYbSxBu8=",
"date": "unstable-2024-01-15"
"rev": "85a2ac6c911ffcc77cf1bab418c78fe5218c0b1a",
"hash": "sha256-iHfdsI6E2LQTC9HjqVRBHihVUpagtB8326M8Crll2iY=",
"date": "unstable-2024-02-04"
},
"gw": {
"owner": "libretro",
@ -277,9 +277,9 @@
"mame": {
"owner": "libretro",
"repo": "mame",
"rev": "68520cf9defd1c2762bca7f266f13ad593b7b3f3",
"hash": "sha256-moYxyoa6QUCvxVPTr4NpRiEC+7bPETohVSYu4EYegFA=",
"date": "unstable-2024-01-03"
"rev": "f55fe47b0997d24048700898195cb66bc0bccfb6",
"hash": "sha256-JUL4ha7UL+hNG5oi178nLT1aUuxqfev0/bRU6y/Mg7A=",
"date": "unstable-2024-02-05"
},
"mame2000": {
"owner": "libretro",
@ -361,10 +361,10 @@
"mrboom": {
"owner": "Javanaise",
"repo": "mrboom-libretro",
"rev": "c4ec620424fe79f0d6db719d73628f23ae285ada",
"hash": "sha256-twocTyayV79a4757Yfoz/P3wnQPgiwsbrBbLmT4EZKQ=",
"rev": "865be65118ef70e9a486f872948f4fc805edf643",
"hash": "sha256-jdOthryC1QvVvuPZUh/YyZhJeFWk1XhBuCm4hmAy8+Q=",
"fetchSubmodules": true,
"date": "unstable-2024-01-23"
"date": "unstable-2024-02-05"
},
"mupen64plus": {
"owner": "libretro",
@ -448,18 +448,18 @@
"play": {
"owner": "jpd002",
"repo": "Play-",
"rev": "c0da95cf596834620169173dc12b3f32ca092404",
"hash": "sha256-q6ApOsyNS5to+KBYgz+CZJOfNAcII6Eyv0MhcB4Q1bU=",
"rev": "34c4c74fbd0ca2223c203bffc23f57157769074b",
"hash": "sha256-Nn2VsZOuwyBQxFBGGLVfD5BvvqJBI7g8HoShmH0hch8=",
"fetchSubmodules": true,
"date": "unstable-2024-01-26"
"date": "unstable-2024-02-05"
},
"ppsspp": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "d479b74ed9c3e321bc3735da29bc125a2ac3b9b2",
"hash": "sha256-I84zJqEE1X/eo/ukeGA2iZe3lWKvilk+RNGUzl2wZXY=",
"rev": "f65c84f4cb8117b273e7fa2ab578c95aedc6dd56",
"hash": "sha256-GgXozubq6ByZDWGkUrzeEgKxUaBaIN3NY5/IIRBNn/o=",
"fetchSubmodules": true,
"date": "unstable-2024-02-04"
"date": "unstable-2024-02-05"
},
"prboom": {
"owner": "libretro",

View file

@ -76,14 +76,14 @@ let
urllib3
];
in mkDerivation rec {
version = "3.28.14";
version = "3.28.15";
pname = "qgis-ltr-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-BiBrnma6HlaRF2kC/AwbdhRaZOYrJ7lzDLdJfjkDmfk=";
hash = "sha256-R6p1MVeCMbaD74Eqn+OLQkTYP+00y9mBucJR1JXPEJ4=";
};
passthru = {

View file

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
version = "1.4.05";
version = "1.5.00";
nativeBuildInputs = [
p7zip
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-GLwxzSTzunbFrfT5e1xeHuy3O+kokb4fi4BPsFZ9tOA=";
sha256 = "sha256-KnhwulPpYdN6x1n9TD89Gv1Y20tSmKWT2WcuhoTMg3Y=";
};
buildInputs = [

View file

@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "gpu-viewer";
version = "2.32";
version = "3.02";
format = "other";
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "arunsivaramanneo";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-zv53tvFQ0NAqFPYp7qZVmbuM1fBJwC4t43YJDZdqSPU=";
hash = "sha256-/m8kXCICvWDqKIC6DbhUAXsjT+RNLMTsvlVTx85AJhE=";
};
nativeBuildInputs = [
@ -67,6 +67,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/arunsivaramanneo/GPU-Viewer";
description = "A front-end to glxinfo, vulkaninfo, clinfo and es2_info";
changelog = "https://github.com/arunsivaramanneo/GPU-Viewer/releases/tag/v${version}";
maintainers = with maintainers; [ GaetanLepage ];
license = licenses.gpl3;
platforms = platforms.linux;

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "harsh";
version = "0.8.31";
version = "0.9.0";
src = fetchFromGitHub {
owner = "wakatara";
repo = pname;
rev = "v${version}";
hash = "sha256-q2kQAQu1rewCDk+UPuEHS4AJlhuC8azHk5MWP6uQ4fI=";
hash = "sha256-7QU3vbJNapMyjnCJrvK+jjUJDHE0+GaP7GKUu7UJcvU=";
};
vendorHash = "sha256-zjLXq64uC5iRm9uxUGDW5127z25gNSVV2qhVVXuYqY0=";

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyprland-autoname-workspaces";
version = "1.1.11";
version = "1.1.13";
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "hyprland-autoname-workspaces";
rev = version;
hash = "sha256-x9MXp2MZtrnVI3W+6xo34uUHuRnpVeXS+3vbyti1p24=";
hash = "sha256-JEzsbJcDX/qx1CMy+3UwcHOwFLPqyAG58MpGMtdSyYY=";
};
cargoHash = "sha256-mSUtFZvq5+rumefJ6I9C6YzRzu64oJ/bTwaa+rrFlL4=";
cargoHash = "sha256-Rpivw4VCVHjZywDwr4pajfGv/mkOdVrXVT/9Oe2Hw44=";
meta = with lib; {
description = "Automatically rename workspaces with icons of started applications";

View file

@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let
in {
pname = "logseq";
version = "0.10.5";
version = "0.10.6";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
hash = "sha256-F3YbqgvL04P0nXaIVkJlCq/z8hUE0M0UutkBs2omuBE=";
hash = "sha256-OUQh+6HRnzxw8Nn/OkU+DkjPKWKpMN0xchD1vPU3KV8=";
name = "${pname}-${version}.AppImage";
};

View file

@ -245,7 +245,7 @@ buildStdenv.mkDerivation {
hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
})
]
++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "122.0.1") [
++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [
./122.0-libvpx-mozbz1875201.patch
]
++ extraPatches;

View file

@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "122.0";
version = "122.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824";
sha512 = "1d4fe1ed351edd748ede2ef6448798a32de9ed7a075a54a7ed5f7baa7b0c4c7f932c2e29f443c9066829e39f22a1dc94be5d00cc994193e949b72aa4a1c8ba41";
};
extraPatches = [

View file

@ -1,20 +1,20 @@
{
stable = import ./browser.nix {
channel = "stable";
version = "121.0.2277.98";
version = "121.0.2277.106";
revision = "1";
hash = "sha256-vm0aBWiGtjdSu55nCNuhbqn4XVI6l/BxwmpTlTHWt/M=";
hash = "sha256-D0bHpz85J6R6LNWr8zaMt9vyolHYkmo9Bi4VaXCkH1U=";
};
beta = import ./browser.nix {
channel = "beta";
version = "122.0.2365.8";
version = "122.0.2365.16";
revision = "1";
hash = "sha256-1qM61lO7LyX7CuLrKsEuciud7BuDxRKNyQahdFJhq+g=";
hash = "sha256-SeLX7UibXd1nOhxWwMuUTCKK4GkN2TmJPesWhLwCD6A=";
};
dev = import ./browser.nix {
channel = "dev";
version = "122.0.2365.3";
version = "123.0.2380.1";
revision = "1";
hash = "sha256-O2SxGzcvNloxLbexDjA0C28w7EJi1Fl9IUnI1zc1S6Y=";
hash = "sha256-SBlHXURiPoC5Q7wi67tgnuV2PUw4ffniGq6kmOZtIf0=";
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "civo";
version = "1.0.73";
version = "1.0.75";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-rLT4HvA0GjbZyiaiXFnG2iBK7O3S94wJL4jrkcFADFc=";
sha256 = "sha256-ElhNxrbXywOWQmhgzM56NfGo7qOLn/Ju4/lOOoc5sDk=";
};
vendorHash = "sha256-oqitgYSL7nf2Lyne0c2vHOSOEG5uHPH9+3lgiROK2Yc=";

View file

@ -7,9 +7,9 @@
}:
let
version = "2.2.2";
sha256 = "0d4sf1b0dddcarngr4dllhbbyjajpf1byv9cf7nx9040i80vk56p";
manifestsSha256 = "1ixdzgaw3mrkwbazfbx0vc04z4rsyyyj5dsck15dv5kkvhi304lg";
version = "2.2.3";
sha256 = "12rrai56hl86213lsi8i4qrah0v7a36nks38g5373imyl9g497ym";
manifestsSha256 = "1hmzmzijpx49hh2ykv7vw3jp02dxr4qn3r1dma56g7b4nbk7aa8x";
manifests = fetchzip {
url =
@ -29,7 +29,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorHash = "sha256-jbhxSeLjgNmj2wCZao4DkQ57GvpYKlUyy7xdNKN1nWc=";
vendorHash = "sha256-UPX5V3VwpX/eDy9ktqpvYb0JOzKRHH2nIQZzZ0jrYoQ=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

View file

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.13.4";
version = "3.15.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
rev = "v${version}";
hash = "sha256-h6GxU7y6z5wyZjuK7wI6BG0aF2u6hqLsID7ijTNzifc=";
hash = "sha256-Mt9bSgmqjj9KkJJW0F2tr2P8GtSy80h9CfMXvIxyKc4=";
};
vendorHash = null;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-unittest";
version = "0.3.5";
version = "0.4.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-RgEYFTI1uaW1aTr+/lpKQ39o5CLsj/p0JeSTUXti/IM=";
hash = "sha256-8rGYFoBhNPJnsZsRXJ7Z9a/KOV4d2ZIVLSdYCpf3IMs=";
};
vendorHash = "sha256-P0PVzgaUN9X9x77v1psV13vNl06HrHbdlA1YHCq/eCo=";
vendorHash = "sha256-wD4FxJ/+8iw2qAz+s0G/8/PKt7X0MZn+roWtc/wTWmw=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''

View file

@ -1,8 +1,8 @@
{
k3sVersion = "1.28.5+k3s1";
k3sCommit = "5b2d1271a6a00a8d71981cc968bc0f822620b9d8";
k3sRepoSha256 = "0bxgzcv83d6kg8knsxrfzpscihw8wj3i7knlm23zzw4n98p4s29y";
k3sVendorHash = "sha256-iBw2lHDAi3wIxaK9LX6tzV7DtNllq6kDLJBH3kVqfqQ=";
k3sVersion = "1.28.6+k3s1";
k3sCommit = "39a0001575780fffa6aae0271f4cb4ce7413aac8";
k3sRepoSha256 = "1bhbpbgs02gh5y7pgn6vmanacrz3p0b2gq3w2kqpb11bijp2alld";
k3sVendorHash = "sha256-Mo+gZ+NOZqd3CP/Z02LfO4dHyEuRhabZVAU60GofOMo=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nomad-driver-podman";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MYqsTuMLxbVNWLAWjQ8xQts5qJvhTylle7YLtGyswjY=";
sha256 = "sha256-L2OnnSTrr49THE2ZQpuHagTjcg3/pt/ydivGmWZSvas=";
};
vendorHash = "sha256-wjJ+mq/m7IjbwypoBvBhjOyAT4v4HDSChHY5OE0xA2U=";
vendorHash = "sha256-0a8wnwyquDrEnPlR337uCxMzuc/9MjgGUsDd+xIfPhw=";
subPackages = [ "." ];

View file

@ -1098,6 +1098,15 @@
"spdx": "MPL-2.0",
"vendorHash": null
},
"slack": {
"hash": "sha256-efYNaDvy9cQmR4VhUABF+ozAh6M3y+em8bQtHlU7A2o=",
"homepage": "https://registry.terraform.io/providers/pablovarela/slack",
"owner": "pablovarela",
"repo": "terraform-provider-slack",
"rev": "v1.2.2",
"spdx": "GPL-3.0",
"vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
},
"snowflake": {
"hash": "sha256-uMXU/0LqOMBRaIOw1hxCdWuogrkWW9r/28YHniOxCbA=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.55.0";
version = "0.55.1";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-OWhngNfcCxubGirDV+PdQHLmO/OjXHiUjqY3lt+wWW8=";
hash = "sha256-SYMdn/d13YUlgK1l1pWQsJo31JG4leaCZckKmUWqpUA=";
};
vendorHash = "sha256-Y5+XruUqya+sY3DuX/bVVT4ZVYmTBIDoFRAiRKFyX3M=";
vendorHash = "sha256-uFSkolmQV11cY+3ZWrlByHDFolpr2E+9/R95bhBn6zo=";
doCheck = false;

View file

@ -64,14 +64,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "4.14.9";
version = "4.14.13";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-VqLCkGav6qtam9qk2MsjCdyVSj3630FGQg50Mv0OBNE=";
hash = "sha256-JcW/gXSgtzxv/37V13brHsa4XcVyB5ZCiPj4slMFdro=";
};
patches = [
@ -87,13 +87,16 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
--replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
--replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
--replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
--replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \
--replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
'';
# We want to run wrapProgram manually (with additional parameters)

View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "twitch-tui";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "Xithrius";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-q7Z7a/Mfi6djUGK0xvhD0WznxQlDyejZtaq9rSlNz8g=";
hash = "sha256-h8qpsrMFFb49yfNb5mKEYRpul0hB0m1rDCvVW6jW+Pg=";
};
cargoHash = "sha256-utnwDqQe0PScRXUD/mC6/uSX8cjBHLbRsO0GcVntPKk=";
cargoHash = "sha256-L7psqmU4Zd7c0mbd4pK/tmPslTaxIhQoWtN0/RRMerA=";
nativeBuildInputs = [
pkg-config

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "last";
version = "1519";
version = "1540";
src = fetchFromGitLab {
owner = "mcfrith";
repo = "last";
rev = "refs/tags/${version}";
hash = "sha256-659YiC7NA6ottOR41jo3ayh4lwReWj46NKMhMPuebF4=";
hash = "sha256-oGGpPWWQ5EVK9n5BLQwt1Wch2Xn24B+NrKg6+VrsUMY=";
};
nativeBuildInputs = [

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "eigenmath";
version = "unstable-2024-01-23";
version = "unstable-2024-02-04";
src = fetchFromGitHub {
owner = "georgeweigt";
repo = pname;
rev = "1d55696b742fee0b4ef8e39b7a420c00c2f1e329";
hash = "sha256-AQdCFKDUWfNKxZoWp82DdxUA2GiMGWyuyh7Fkofm9kc=";
rev = "3e37263611e181e2927d63b97b7656790c7f4fe1";
hash = "sha256-gjmz9Ma7OLQyIry6i2HMNy4Ai5Wh5NUzDKPO2a9Hp+s=";
};
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''

View file

@ -132,5 +132,6 @@ in maven'.buildMavenPackage {
binaryBytecode # maven dependencies
];
broken = stdenv.isDarwin; # builds, doesn't run
mainProgram = "refine";
};
}

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "8.3.2";
version = "8.4.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-urC8IVfliVzyWu7zqZN5EI6d3vXz80vHPhQaKBzTEVA=";
hash = "sha256-d3pUVhn9oi1ILDR4sfRh6HypbDn2JZMha27h0twixPc=";
# https://github.com/python-versioneer/python-versioneer/issues/217
postFetch = ''
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'

View file

@ -3,20 +3,19 @@
, python3
, fetchFromGitHub
, fetchurl
, fetchpatch
, frigate
, nixosTests
}:
let
version = "0.12.1";
version = "0.13.1";
src = fetchFromGitHub {
#name = "frigate-${version}-source";
owner = "blakeblackshear";
repo = "frigate";
rev = "refs/tags/v${version}";
hash = "sha256-kNvYsHoObi6b9KT/LYhTGK4uJ/uAHnYhyoQkiXIA/s8=";
hash = "sha256-2J7DhnYDX9ubbsk0qhji/vIKDouy9IqQztzbdPj2kxo=";
};
frigate-web = callPackage ./web.nix {
@ -35,7 +34,7 @@ let
};
# Tensorflow Lite models
# https://github.com/blakeblackshear/frigate/blob/v0.12.0/Dockerfile#L88-L91
# https://github.com/blakeblackshear/frigate/blob/v0.13.0/docker/main/Dockerfile#L96-L97
tflite_cpu_model = fetchurl {
url = "https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess.tflite";
hash = "sha256-kLszpjTgQZFMwYGapd+ZgY5sOWxNLblSwP16nP/Eck8=";
@ -46,7 +45,7 @@ let
};
# OpenVino models
# https://github.com/blakeblackshear/frigate/blob/v0.12.0/Dockerfile#L92-L95
# https://github.com/blakeblackshear/frigate/blob/v0.13.0/docker/main/Dockerfile#L101
openvino_model = fetchurl {
url = "https://github.com/openvinotoolkit/open_model_zoo/raw/master/data/dataset_classes/coco_91cl_bkgr.txt";
hash = "sha256-5Cj2vEiWR8Z9d2xBmVoLZuNRv4UOuxHSGZQWTJorXUQ=";
@ -59,14 +58,6 @@ python.pkgs.buildPythonApplication rec {
inherit src;
patches = [
(fetchpatch {
# numpy 1.24 compat
url = "https://github.com/blakeblackshear/frigate/commit/cb73d0cd392990448811c7212bc5f09be411fc69.patch";
hash = "sha256-Spt7eRosmTN8zyJ2uVme5HPVy2TKgBtvbQ6tp6PaNac=";
})
];
postPatch = ''
echo 'VERSION = "${version}"' > frigate/version.py
@ -75,58 +66,59 @@ python.pkgs.buildPythonApplication rec {
substituteInPlace frigate/const.py \
--replace "/media/frigate" "/var/lib/frigate" \
--replace "/tmp/cache" "/var/cache/frigate/"
--replace "/tmp/cache" "/var/cache/frigate" \
--replace "/config" "/var/lib/frigate" \
--replace "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache"
substituteInPlace frigate/http.py \
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \
--replace "/tmp/cache/" "/var/cache/frigate/"
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"
substituteInPlace frigate/output.py \
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"
substituteInPlace frigate/record.py \
--replace "/tmp/cache" "/var/cache/frigate"
substituteInPlace frigate/detectors/detector_config.py \
--replace "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt"
substituteInPlace frigate/detectors/plugins/edgetpu_tfl.py \
substituteInPlace frigate/config.py \
--replace "/cpu_model.tflite" "${tflite_cpu_model}" \
--replace "/edgetpu_model.tflite" "${tflite_edgetpu_model}"
substituteInPlace frigate/detectors/plugins/cpu_tfl.py \
--replace "/cpu_model.tflite" "${tflite_cpu_model}"
substituteInPlace frigate/ffmpeg_presets.py --replace \
'"-timeout" if os.path.exists(BTBN_PATH) else "-stimeout"' \
'"-timeout"'
substituteInPlace frigate/test/test_config.py \
--replace "(MODEL_CACHE_DIR" "('/build/model_cache'" \
--replace "/config/model_cache" "/build/model_cache"
'';
dontBuild = true;
propagatedBuildInputs = with python.pkgs; [
# requirements.txt
# docker/main/requirements.txt
scikit-build
# requirements-wheel.txt
# docker/main/requirements-wheel.txt
click
flask
imutils
matplotlib
norfair
numpy
onvif-zeep
opencv4
openvino
paho-mqtt
peewee
peewee-migrate
psutil
py3nvml
pydantic
pytz
pyyaml
requests
ruamel-yaml
scipy
setproctitle
tensorflow
tzlocal
unidecode
ws4py
zeroconf
];
installPhase = ''
@ -144,10 +136,15 @@ python.pkgs.buildPythonApplication rec {
runHook postInstall
'';
checkInputs = with python.pkgs; [
nativeCheckInputs = with python.pkgs; [
pytestCheckHook
];
disabledTests = [
# Test needs network access
"test_plus_labelmap"
];
passthru = {
web = frigate-web;
inherit python;

View file

@ -11,14 +11,14 @@ buildNpmPackage {
postPatch = ''
substituteInPlace package.json \
--replace "--base=/BASE_PATH/" ""
--replace-fail "--base=/BASE_PATH/" ""
substituteInPlace src/routes/Storage.jsx \
--replace "/media/frigate" "/var/lib/frigate" \
--replace "/tmp/cache" "/var/cache/frigate"
--replace-fail "/media/frigate" "/var/lib/frigate" \
--replace-fail "/tmp/cache" "/var/cache/frigate"
'';
npmDepsHash = "sha256-fvRxpQjSEzd2CnoEOVgQcB6MJJ4dcjN8bOaacHjCdwU=";
npmDepsHash = "sha256-+36quezGArqIM9dM+UihwcIgmE3EVmJQThuicLgDW4A=";
installPhase = ''
cp -rv dist/ $out

View file

@ -78,6 +78,8 @@
obs-websocket = qt6Packages.callPackage ./obs-websocket.nix { }; # Websocket 4.x compatibility for OBS Studio 28+
obs-webkitgtk = callPackage ./obs-webkitgtk.nix { };
wlrobs = callPackage ./wlrobs.nix { };
waveform = callPackage ./waveform { };

View file

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, obs-studio
, webkitgtk
, glib-networking
, meson
, cmake
, pkg-config
, ninja
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "obs-webkitgtk";
version = "unstable-2023-11-10";
src = fetchFromGitHub {
owner = "fzwoch";
repo = "obs-webkitgtk";
rev = "ddf230852c3c338e69b248bdf453a0630f1298a7";
hash = "sha256-DU2w9dRgqWniTE76KTAtFdxIN82VKa/CS6ZdfNcTMto=";
};
buildInputs = [
obs-studio
webkitgtk
glib-networking
];
nativeBuildInputs = [
meson
cmake
pkg-config
ninja
wrapGAppsHook
];
postPatch = ''
substituteInPlace ./obs-webkitgtk.c \
--replace 'g_file_read_link("/proc/self/exe", NULL)' "g_strdup(\"$out/lib/obs-plugins\")"
'';
meta = with lib; {
description = "Yet another OBS Studio browser source";
homepage = "https://github.com/fzwoch/obs-webkitgtk";
maintainers = with maintainers; [ j-hui ];
license = licenses.gpl2Only;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,38 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, ncurses, openssl }:
stdenv.mkDerivation {
pname = "boinctui";
version = "2.7.1-unstable-2023-12-14";
src = fetchFromGitHub {
owner = "suleman1971";
repo = "boinctui";
rev = "6656f288580170121f53d0e68c35077f5daa700b"; # no proper release tags unfortunaly
hash = "sha256-MsSTvlTt54ukQXyVi8LiMFIkv8FQJOt0q30iDxf4TsE=";
};
# Fix wrong path; @docdir@ already gets replaced with the correct store path
postPatch = ''
substituteInPlace Makefile.in \
--replace 'DOCDIR = $(DATAROOTDIR)@docdir@' 'DOCDIR = @docdir@'
'';
outputs = [ "out" "man" ];
separateDebugInfo = stdenv.isLinux;
enableParallelBuilding = true;
configureFlags = [ "--without-gnutls" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ expat ncurses openssl ];
meta = with lib; {
description = "Curses based fullscreen BOINC manager";
homepage = "https://github.com/suleman1971/boinctui";
changelog = "https://github.com/suleman1971/boinctui/blob/master/changelog";
license = licenses.gpl3Only;
maintainers = with maintainers; [ christoph-heiss ];
platforms = platforms.linux;
mainProgram = "boinctui";
};
}

View file

@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitHub, SDL2, glew, lua5_4, desktopToDarwinBundle }:
stdenv.mkDerivation rec {
pname = "cadzinho";
version = "0.4.1";
src = fetchFromGitHub {
owner = "zecruel";
repo = "CadZinho";
rev = version;
hash = "sha256-6/sBNxQb52FFO2fWLVs6YDOmJLEbSOA5mwdMdJDjEDM=";
};
postPatch = ''
substituteInPlace src/gui_config.c --replace "/usr/share/cadzinho" "$out/share/cadzinho"
'';
nativeBuildInputs = lib.optional stdenv.isDarwin desktopToDarwinBundle;
buildInputs = [ SDL2 glew lua5_4 ];
makeFlags = [ "CC:=$(CC)" ];
# https://github.com/llvm/llvm-project/issues/62254
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-builtin-strrchr";
hardeningDisable = [ "format" ];
installPhase = ''
runHook preInstall
install -Dm755 cadzinho -t $out/bin
install -Dm644 lang/*.lua -t $out/share/cadzinho/lang
cp -r linux/CadZinho/share/* $out/share
runHook postInstall
'';
meta = with lib; {
description = "Minimalist computer aided design (CAD) software";
homepage = "https://github.com/zecruel/CadZinho";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
mainProgram = "cadzinho";
};
}

View file

@ -1,8 +1,9 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "FosterFramework"; version = "0.1.15-alpha"; sha256 = "0pzsdfbsfx28xfqljcwy100xhbs6wyx0z1d5qxgmv3l60di9xkll"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1gjz379y61ag9whi78qxx09bwkwcznkx2mzypgycibxk61g11da1"; })
(fetchNuGet { pname = "FosterFramework"; version = "0.1.18-alpha"; sha256 = "0jglck1ffdyp48sqmadlsxdddlyq45ydfzlxbrqdhszzi92ipq7a"; })
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1g5b30f4l8a1zjjr3b8pk9mcqxkxqwa86362f84646xaj4iw3a4d"; })
(fetchNuGet { pname = "SharpGLTF.Core"; version = "1.0.0-alpha0031"; sha256 = "0ln78mkhbcxqvwnf944hbgg24vbsva2jpih6q3x82d3h7rl1pkh6"; })
(fetchNuGet { pname = "SharpGLTF.Runtime"; version = "1.0.0-alpha0031"; sha256 = "0lvb3asi3v0n718qf9y367km7qpkb9wci38y880nqvifpzllw0jg"; })
(fetchNuGet { pname = "Sledge.Formats"; version = "1.2.2"; sha256 = "1y0l66m9rym0p1y4ifjlmg3j9lsmhkvbh38frh40rpvf1axn2dyh"; })

View file

@ -8,7 +8,6 @@
SDL2,
libGL,
mesa,
fmodex,
systemd,
libpulseaudio,
libselinux,
@ -19,15 +18,16 @@
libdrm,
withSELinux ? false,
}:
buildDotnetModule rec {
pname = "celeste64";
version = "0-unstable-2024-02-02";
version = "1.1.1";
src = fetchFromGitHub {
repo = "Celeste64";
owner = "ExOK";
rev = "e7130d376deed9ddf17a6631cf06d89d19a702c6";
hash = "sha256-KCCgjplAk+Nhjxk/p6Omt4GxN36kAgvg/OPbed2Ey+4=";
rev = "v${version}";
hash = "sha256-XRAjDYIqYaQYCWNNT7UuLDKDBgq3vqxtCzay7pGICtA=";
};
projectFile = "Celeste64.csproj";
dotnet-sdk = dotnetCorePackages.sdk_8_0;
@ -41,7 +41,6 @@ buildDotnetModule rec {
libdecor
libGL
SDL2
fmodex
systemd
libpulseaudio
wayland
@ -79,7 +78,7 @@ buildDotnetModule rec {
meta = {
license = with lib.licenses; [ unfree mit ];
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
maintainers = with lib.maintainers; [ lychee ];
mainProgram = "Celeste64";
homepage = "https://github.com/ExOK/Celeste64";

View file

@ -0,0 +1,22 @@
{ buildDotnetGlobalTool, dotnetCorePackages, lib }:
buildDotnetGlobalTool {
pname = "csharprepl";
nugetName = "CSharpRepl";
version = "0.6.6";
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
nugetSha256 = "sha256-VkZGnfD8p6oAJ7i9tlfwJfmKfZBHJU7Wdq+K4YjPoRs=";
meta = with lib; {
description = "C# REPL with syntax highlighting";
homepage = "https://fuqua.io/CSharpRepl";
changelog = "https://github.com/waf/CSharpRepl/blob/main/CHANGELOG.md";
license = licenses.mpl20;
platforms = platforms.unix;
maintainers = with maintainers; [ donteatoreo ];
mainProgram = "csharprepl";
};
}

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gcli";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "herrhotzenplotz";
repo = "gcli";
rev = version;
hash = "sha256-JZL0AcbrGYBceQ6ctspgnbzlVD4pg95deg9BWUFQCv8=";
hash = "sha256-extVTaTWVFXSTiXlZ/MtiiFdc/KZEDkc+A7xxylJaM4=";
};
nativeBuildInputs = [ autoreconfHook pkg-config byacc flex ];

View file

@ -1,6 +1,7 @@
{ lib
, buildNpmPackage
, fetchurl
, git
, installShellFiles
}:
@ -20,6 +21,7 @@ buildNpmPackage rec {
'';
nativeBuildInputs = [
git
installShellFiles
];
@ -28,6 +30,7 @@ buildNpmPackage rec {
postInstall = ''
installShellCompletion --cmd gt \
--bash <($out/bin/gt completion) \
--fish <(GT_PAGER= $out/bin/gt fish) \
--zsh <(ZSH_NAME=zsh $out/bin/gt completion)
'';

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "kmsvnc";
version = "0.0.5";
version = "0.0.6";
src = fetchFromGitHub {
owner = "isjerryxiao";
repo = "kmsvnc";
rev = "v${version}";
hash = "sha256-Dz1y4t8u9/rnmOiYMWMq6aEq3kV47uiIK7K4DSvjZNc=";
hash = "sha256-fOryY9pkeRXjfOq4ZcUKBrBDMWEljLChwXSAbeMNXhw=";
};
nativeBuildInputs = [

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pkgconf";
version = "2.1.0";
version = "2.1.1";
src = fetchurl {
url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz";
hash = "sha256-Jm1YYe5RxSvHECk6HTZiKuFtBI1x7FYDSgLrnPlnd2E=";
hash = "sha256-OiJPKszwkbd6V4Exbie57juoLAg8wuU54IlAtopE/sU=";
};
outputs = [ "out" "lib" "dev" "man" "doc" ];

View file

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "15.2.1";
version = "15.2.2";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-CYPDrzEu592gGeZkBYNGwGooRwQyKEj46hnxtBVQDT4=";
hash = "sha256-gdL/gOAHcgvKUot6MmC1rUMmcrLgLMf1ISc1oPNWJOQ=";
};
npmDepsHash = "sha256-m7VIEuCVDPd+ZgI8DJa01f/q9uYCzRtVbdfcipBRTmY=";
npmDepsHash = "sha256-32E5y0s6Hm8i74zso/yOmCYWZ6y2Sx4rn8ylSb0c8qE=";
dontNpmBuild = true;

View file

@ -31,13 +31,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "llama-cpp";
version = "2050";
version = "2074";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "refs/tags/b${finalAttrs.version}";
hash = "sha256-Wli9dZ5Aa4Xk/c9e2DqcernyfXaT3hd8qRo0GzrnxZU=";
hash = "sha256-i5I0SsjnDSo+/EzKQzCLV/SNMlLdvY+h9jKN+KlN6L4=";
};
postPatch = ''

View file

@ -12,11 +12,11 @@
}:
stdenv.mkDerivation rec {
pname = "microsoft-identity-broker";
version = "1.6.1";
version = "1.7.0";
src = fetchurl {
url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb";
hash = "sha256-DYXGqMBUGKw4xsWpD973t5ZccBTh0LmVfLMX1T5DNms=";
hash = "sha256-81hKYQKbSimAScO6L13GdweFfzoVpeQzKuV8GJ6kZ1U=";
};
nativeBuildInputs = [ dpkg makeWrapper openjdk11 zip ];

View file

@ -12,7 +12,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "monophony";
version = "2.5.2";
version = "2.6.0";
format = "other";
sourceRoot = "source/source";
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
owner = "zehkira";
repo = "monophony";
rev = "v${version}";
hash = "sha256-DIAvRxUC1JIK4Tyc+REqgO6kZRokPcmLCKwI/+YRGx8=";
hash = "sha256-dLv1zdhWXOimxhoyf0T8oM5dF4fKepcIED+DG6D1MH0=";
};
pythonPath = with python3Packages; [

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "namespace-cli";
version = "0.0.332";
version = "0.0.333";
src = fetchFromGitHub {
owner = "namespacelabs";
repo = "foundation";
rev = "v${version}";
hash = "sha256-6pTL3mvW8O3vly1a+LUTMBnD5D907CfQIqDwTnUqT1s=";
hash = "sha256-T0venXPksmr2prnYMZw4tAxj6oRShC6ImdhY8BeovO8=";
};
vendorHash = "sha256-DcGp/5Ohk9gbviA31a1FTu/xglLjrz2S50A5DBAE+lc=";
vendorHash = "sha256-jC9DL2E/Fprah22RDJSrt1ohYTKgU8RrfTTgEPU2q3Q=";
subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"];

View file

@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchurl
, autoPatchelfHook
, udev
, libusb1
, segger-jlink
}:
let
supported = {
x86_64-linux = {
name = "linux-amd64";
hash = "sha256-zL9tXl2HsO8JZXEGsjg4+lDJJz30StOMH96rU7neDsg=";
};
aarch64-linux = {
name = "linux-arm64";
hash = "sha256-ACy3rXsvBZNVXdVkpP2AqrsoqKPliw6m9UUWrFOCBzs=";
};
armv7l-linux = {
name = "linux-armhf";
hash = "sha256-nD1pHL/SQqC7OlxuovWwvtnXKMmhfx5qFaF4ti8gh8g=";
};
};
platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
version = "10.23.2";
url = let
versionWithDashes = builtins.replaceStrings ["."] ["-"] version;
in "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-${lib.versions.major version}-x-x/${versionWithDashes}/nrf-command-line-tools-${version}_${platform.name}.tar.gz";
in stdenv.mkDerivation {
pname = "nrf-command-line-tools";
inherit version;
src = fetchurl {
inherit url;
inherit (platform) hash;
};
runtimeDependencies = [
segger-jlink
];
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [
udev
libusb1
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
rm -rf ./python
mkdir -p $out
cp -r * $out
runHook postInstall
'';
meta = with lib; {
description = "Nordic Semiconductor nRF Command Line Tools";
homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools";
license = licenses.unfree;
platforms = attrNames supported;
maintainers = with maintainers; [ stargate01 ];
};
}

View file

@ -0,0 +1,44 @@
{ lib
, fetchurl
, appimageTools
}:
let
pname = "nrfconnect";
version = "4.3.0";
src = fetchurl {
url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage";
hash = "sha256-G8//dZqPxn6mR8Bjzf/bAn9Gv7t2AFWIF9twCGbqMd8=";
name = "${pname}-${version}.AppImage";
};
appimageContents = appimageTools.extractType2 {
inherit pname version src;
};
in appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: with pkgs; [
segger-jlink
];
extraInstallCommands = ''
mv $out/bin/nrfconnect-* $out/bin/nrfconnect
install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/usr/share/icons/hicolor/512x512/apps/nrfconnect.png \
-t $out/share/icons/hicolor/512x512/apps
substituteInPlace $out/share/applications/nrfconnect.desktop \
--replace 'Exec=AppRun' 'Exec=nrfconnect'
'';
meta = with lib; {
description = "Nordic Semiconductor nRF Connect for Desktop";
homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ stargate01 ];
mainProgram = "nrfconnect";
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "orchard";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = version;
hash = "sha256-9hxfRiZ3V65wvh8n1SGeTzNdjdoEfRtyFOv4+f/u+O8=";
hash = "sha256-bDXb8yKaDSYw9fZ/VBvacUebRMdlI+lzIe9KFa7uVyk=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -19,7 +19,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-LBvd8qah+v0y3dHadSs69/y6pr8TyZ0nDJgHR+8qlEo=";
vendorHash = "sha256-qqq1CKZm95pJ3u7/oHKhRL3ZIGN9LCRcnESE2w/DJrQ=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
+ lib.optionalString forceWayland "-wayland";
version = "1.17";
version = "1.17.1";
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-BJWcaxUUxNDiSX3YnhwXhgbp3iymcrR493BKrtivn3U=";
hash = "sha256-I84zJqEE1X/eo/ukeGA2iZe3lWKvilk+RNGUzl2wZXY=";
};
postPatch = ''

View file

@ -4,14 +4,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "rclip";
version = "1.7.6";
version = "1.7.24";
pyproject = true;
src = fetchFromGitHub {
owner = "yurijmikhalevich";
repo = "rclip";
rev = "v${version}";
hash = "sha256-lWaWq+dcAa/2pONka4xRpixqDuL6iYDF46vCyCmVWwE=";
hash = "sha256-JWtKgvSP7oaPg19vWnnCDfm7P5Uew+v9yuvH7y2eHHM=";
};
nativeBuildInputs = with python3Packages; [
@ -27,7 +27,9 @@ python3Packages.buildPythonApplication rec {
tqdm
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
nativeCheckInputs = with python3Packages; [ pytestCheckHook pythonRelaxDepsHook ];
pythonRelaxDeps = [ "torch" "torchvision" ];
pythonImportsCheck = [ "rclip" ];

View file

@ -0,0 +1,228 @@
{ lib
, stdenv
, fetchurl
, autoPatchelfHook
, udev
, config
, acceptLicense ? config.segger-jlink.acceptLicense or false
, fontconfig
, xorg
, makeDesktopItem
, copyDesktopItems
}:
let
supported = {
x86_64-linux = {
name = "x86_64";
hash = "sha256-WGEDvB6TJ8Y2Xl1VUB1JWVMK54OevvPoVGris3I27t4=";
};
i686-linux = {
name = "i386";
hash = "sha256-BOQ4yExDRGKuUvsPUUswElrps0SpXcDCHxy2tmGbV/I=";
};
aarch64-linux = {
name = "arm64";
hash = "sha256-ZWzaWCUgV4x5Fbz+jphj771kIyLyeoRZKjgf8rmbFxQ=";
};
armv7l-linux = {
name = "arm";
hash = "sha256-Qjb5P1XH/CoiLP9iqWyEX0YHUjDIuSdw5ej1bE61T48=";
};
};
platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
version = "794a";
url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz";
src =
assert !acceptLicense -> throw ''
Use of the "SEGGER JLink Software and Documentation pack" requires the
acceptance of the following licenses:
- SEGGER Downloads Terms of Use [1]
- SEGGER Software Licensing [2]
You can express acceptance by setting acceptLicense to true in your
configuration. Note that this is not a free license so it requires allowing
unfree licenses as well.
configuration.nix:
nixpkgs.config.allowUnfree = true;
nixpkgs.config.segger-jlink.acceptLicense = true;
config.nix:
allowUnfree = true;
segger-jlink.acceptLicense = true;
[1]: ${url}
[2]: https://www.segger.com/purchase/licensing/
'';
fetchurl {
inherit url;
inherit (platform) hash;
curlOpts = "--data accept_license_agreement=accepted";
};
qt4-bundled = stdenv.mkDerivation {
pname = "segger-jlink-qt4";
inherit src version;
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [
stdenv.cc.cc.lib
fontconfig
xorg.libXrandr
xorg.libXfixes
xorg.libXcursor
xorg.libSM
xorg.libICE
xorg.libX11
];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
# Install libraries
mkdir -p $out/lib
mv libQt* $out/lib
runHook postInstall
'';
meta = with lib; {
description = "Bundled QT4 libraries for the J-Link Software and Documentation pack";
homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
license = licenses.lgpl21;
maintainers = with maintainers; [ stargate01 ];
knownVulnerabilities = [
"This bundled version of Qt 4 has reached its end of life after 2015. See https://github.com/NixOS/nixpkgs/pull/174634"
"CVE-2023-43114"
"CVE-2023-38197"
"CVE-2023-37369"
"CVE-2023-34410"
"CVE-2023-32763"
"CVE-2023-32762"
"CVE-2023-32573"
"CVE-2022-25634"
"CVE-2020-17507"
"CVE-2020-0570"
"CVE-2018-21035"
"CVE-2018-19873"
"CVE-2018-19871"
"CVE-2018-19870"
"CVE-2018-19869"
"CVE-2015-1290"
"CVE-2014-0190"
"CVE-2013-0254"
"CVE-2012-6093"
"CVE-2012-5624"
"CVE-2009-2700"
];
};
};
in stdenv.mkDerivation {
pname = "segger-jlink";
inherit src version;
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
buildInputs = [
qt4-bundled
];
# Udev is loaded late at runtime
appendRunpaths = [
"${udev}/lib"
];
dontConfigure = true;
dontBuild = true;
desktopItems = map (entry:
(makeDesktopItem {
name = entry;
exec = entry;
icon = "applications-utilities";
desktopName = entry;
genericName = "SEGGER ${entry}";
categories = [ "Development" ];
type = "Application";
terminal = false;
startupNotify = false;
})
) [
"JFlash"
"JFlashLite"
"JFlashSPI"
"JLinkConfig"
"JLinkGDBServer"
"JLinkLicenseManager"
"JLinkRTTViewer"
"JLinkRegistration"
"JLinkRemoteServer"
"JLinkSWOViewer"
"JLinkUSBWebServer"
"JMem"
];
installPhase = ''
runHook preInstall
# Install binaries and runtime files into /opt/
mkdir -p $out/opt
mv J* ETC GDBServer Firmwares $out/opt
# Link executables into /bin/
mkdir -p $out/bin
for binr in $out/opt/*Exe; do
binrlink=''${binr#"$out/opt/"}
ln -s $binr $out/bin/$binrlink
# Create additional symlinks without "Exe" suffix
binrlink=''${binrlink/%Exe}
ln -s $binr $out/bin/$binrlink
done
# Copy special alias symlinks
for slink in $(find $out/opt/. -type l); do
cp -P -n $slink $out/bin || true
rm $slink
done
# Install libraries
install -Dm444 libjlinkarm.so* -t $out/lib
for libr in $out/lib/libjlinkarm.*; do
ln -s $libr $out/opt
done
# Install docs and examples
mkdir -p $out/share
mv Doc $out/share/docs
mv Samples $out/share/examples
# Install udev rules
install -Dm444 99-jlink.rules -t $out/lib/udev/rules.d/
runHook postInstall
'';
meta = with lib; {
description = "J-Link Software and Documentation pack";
homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
license = licenses.unfree;
platforms = attrNames supported;
maintainers = with maintainers; [ FlorianFranzen stargate01 ];
};
}

View file

@ -6,12 +6,12 @@
python3.pkgs.buildPythonApplication rec {
pname = "signal-export";
version = "1.8.0";
version = "1.8.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZGF6vT+fjmBL3SGrZ/E6bvcxToTlbAcxspQAnR/Aboo=";
sha256 = "sha256-v4civFGu+CLRTGicQAMSei+k6Iyz0GAznTLEr7ylx24=";
};
nativeBuildInputs = with python3.pkgs; [

View file

@ -14,9 +14,9 @@
}:
stdenv.mkDerivation (self: {
pname = "srm-cuarzo";
version = "0.4.0-1";
version = "0.5.0-1";
rev = "v${self.version}";
hash = "sha256-PWtDSBYw62sfyN2lpd7NY8SbqDrt5IN1rdLZRtDfals=";
hash = "sha256-q3pMWryiBR8BEPHvZ/g/jK2hIBTd15RxyU7uocSJsZ8=";
src = fetchFromGitHub {
inherit (self) rev hash;

View file

@ -0,0 +1,69 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, go
, llvm_16
, clang_16
, bash
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tetragon";
version = "0.11.0";
src = fetchFromGitHub {
owner = "cilium";
repo = "tetragon";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-KOR5MMRnhrlcMPqRjzjSJXvitiZQ8/tlxEnBiQG2x/Q=";
};
buildInputs = [
clang_16
go
llvm_16
pkg-config
];
env.NIX_CFLAGS_COMPILE = "-fno-stack-protector -Qunused-arguments";
buildPhase = ''
runHook preBuild
export HOME=$TMP
export LOCAL_CLANG=1
export LOCAL_CLANG_FORMAT=1
make tetragon
make tetragon-operator
make tetra
make tetragon-bpf
runHook postBuild
'';
postPatch = ''
substituteInPlace bpf/Makefile --replace '/bin/bash' '${lib.getExe bash}'
substituteInPlace pkg/defaults/defaults.go --replace '/var/lib/tetragon/' $out/lib/tetragon/bpf/
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/tetragon $out/lib/tetragon/tetragon.tp.d/
sed -i "s+/usr/local/+$out/+g" install/linux-tarball/usr/local/lib/tetragon/tetragon.conf.d/bpf-lib
cp -n -r install/linux-tarball/usr/local/lib/tetragon/tetragon.conf.d/ $out/lib/tetragon/
cp -n -r ./bpf/objs $out/lib/tetragon/bpf
install -m755 -D ./tetra $out/bin/tetra
install -m755 -D ./tetragon $out/bin/tetragon
runHook postInstall
'';
meta = with lib; {
description = "Real-time, eBPF-based Security Observability and Runtime Enforcement tool";
homepage = "https://github.com/cilium/tetragon";
license = licenses.asl20;
mainProgram = "tetragon";
maintainers = with maintainers; [ gangaram ];
platforms = platforms.linux;
sourceProvenance = with sourceTypes; [ fromSource ];
};
})

View file

@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.109";
version = "1.110";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-LnbkHmEyxqv1W/qWeCVQGHKLuv6qX3P8zUMUxx61t38=";
hash = "sha256-6KeKz8lJBCc/sc5pCkS2mSwMAQ8XpwDIMCjSbVXuyH4=";
};
dontUnpack = true;

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "23.12.10";
version = "24.02.05";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-DZmjSMJ1I+Ir/Hz/fmsw36dFSp5S3YF024nJLb/Xxig=";
sha256 = "sha256-XootwpvdYrg3tBsMKssTuTiLPPMaFb7N401XeT889EM=";
};
nativeBuildInputs = [ gtk3 ];

View file

@ -1,12 +1,12 @@
{ lib, stdenvNoCC, fetchurl, directoryListingUpdater }:
{ lib, stdenvNoCC, fetchurl, directoryListingUpdater, crda }:
stdenvNoCC.mkDerivation rec {
pname = "wireless-regdb";
version = "2024.01.23";
version = "2023.09.01";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-yKYcms92+n60I56J9kDe4+hwmNn2m001GMnGD8bSDFU=";
hash = "sha256-JtTCpyfMWSObhHNarYVrfH0LBOMKpcI1xPf0f18FNJE=";
};
dontBuild = true;
@ -16,7 +16,12 @@ stdenvNoCC.mkDerivation rec {
"PREFIX="
];
passthru.updateScript = directoryListingUpdater { };
passthru = {
tests = {
inherit crda; # validate data base signature
};
updateScript = directoryListingUpdater { };
};
meta = with lib; {
description = "Wireless regulatory database for CRDA";

View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitLab
, fetchpatch
, gitUpdater
, testers
, cmake
@ -46,6 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-vuu6tZ5eDJN2rraOpmrDddSl1cIFFBSrILKMJqcUDVc=";
};
patches = [
# Remove when https://gitlab.com/ubports/development/core/lomiri-app-launch/-/merge_requests/57 merged & in release
(fetchpatch {
name = "0001-lomiri-app-launch-Fix-typelib-gir-dependency.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-app-launch/-/commit/0419b2592284f43ee5e76060948ea3d5f1c991fd.patch";
hash = "sha256-11pEhFi39Cvqb9Hg47kT8+5hq+bz6WmySqaIdwt1MVk=";
})
];
postPatch = ''
patchShebangs tests/{desktop-hook-test.sh.in,repeat-until-pass.sh}
@ -100,6 +110,14 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "ENABLE_MIRCLIENT" false)
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [
# Exclude tests
"-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [
# Flaky, randomly hangs
# https://gitlab.com/ubports/development/core/lomiri-app-launch/-/issues/19
"^helper-handshake-test"
]})")
]))
];
postBuild = lib.optionalString withDocumentation ''

View file

@ -7,15 +7,19 @@
, libxfce4util
, xfce4-panel
, xfconf
, curl
, gnome
, jq
, xclip
}:
mkXfceDerivation {
category = "apps";
pname = "xfce4-screenshooter";
version = "1.10.4";
version = "1.10.5";
odd-unstable = false;
sha256 = "sha256-jikvMHpmBLTqwDjTxx4AMU8CnfrtSExFauq+gcTX2E8=";
sha256 = "sha256-x1uQIfiUNMYowrCLpwdt1IsHfJLn81f8I/4NBwX/z9k=";
buildInputs = [
exo
@ -27,6 +31,14 @@ mkXfceDerivation {
xfconf
];
preFixup = ''
# For Imgur upload action
# https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ curl gnome.zenity jq xclip ]}
)
'';
meta = with lib; {
description = "Screenshot utility for the Xfce desktop";
maintainers = with maintainers; [ ] ++ teams.xfce.members;

View file

@ -5,7 +5,8 @@
, cmake
, zlib
, ncurses
, swig
, swig3
, swig4
, which
, libedit
, libxml2
@ -34,6 +35,11 @@ let
cp -r ${monorepoSrc}/cmake "$out"
cp -r ${monorepoSrc}/lldb "$out"
'' else src;
vscodeExt = {
name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";
version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";
};
swig = if lib.versionAtLeast release_version "18" then swig4 else swig3;
in
stdenv.mkDerivation (rec {
@ -58,7 +64,10 @@ stdenv.mkDerivation (rec {
lua5_3
] ++ lib.optionals enableManpages [
python3.pkgs.sphinx
] ++ lib.optionals (lib.versionOlder release_version "18" && enableManpages) [
python3.pkgs.recommonmark
] ++ lib.optionals (lib.versionAtLeast release_version "18" && enableManpages) [
python3.pkgs.myst-parser
] ++ lib.optionals (lib.versionAtLeast release_version "14") [
ninja
];
@ -154,14 +163,14 @@ stdenv.mkDerivation (rec {
# Editor support
# vscode:
install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
ln -s $out/bin/*-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
install -D ../tools/${vscodeExt.name}/package.json $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/package.json
mkdir -p $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin
ln -s $out/bin/*${if lib.versionAtLeast release_version "18" then vscodeExt.name else "-vscode"} $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin
'';
passthru.vscodeExtName = "lldb-vscode";
passthru.vscodeExtName = vscodeExt.name;
passthru.vscodeExtPublisher = "llvm";
passthru.vscodeExtUniqueId = "llvm-org.lldb-vscode-0.1.0";
passthru.vscodeExtUniqueId = "llvm-org.${vscodeExt.name}-${vscodeExt.version}";
meta = llvm_meta // {
homepage = "https://lldb.llvm.org/";

View file

@ -21,6 +21,7 @@ let
sourceRoot = "${src.name}/${pname}";
nativeBuildInputs = [ cmake ninja python3 ]
++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser
++ lib.optional enableManpages python3.pkgs.sphinx
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
@ -70,7 +71,7 @@ let
ln -sv $out/bin/clang $out/bin/cpp
mkdir -p $lib/lib/clang
mv $lib/lib/18 $lib/lib/clang/18
mv $lib/lib/${lib.versions.major version} $lib/lib/clang/${lib.versions.major version}
# Move libclang to 'lib' output
moveToOutput "lib/libclang.*" "$lib"

View file

@ -4,26 +4,22 @@ Date: Thu, 18 May 2017 11:56:12 -0500
Subject: [PATCH] "purity" patch for 5.0
---
lib/Driver/ToolChains/Gnu.cpp | 7 -------
1 file changed, 7 deletions(-)
lib/Driver/ToolChains/Gnu.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index fe3c0191bb..c6a482bece 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
@@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
} else {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");
- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE &&
- !Args.hasArg(options::OPT_r)) {
@@ -446,9 +446,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
ToolChain.isPIEDefault(Args));
if (IsPIE)
CmdArgs.push_back("-pie");
- CmdArgs.push_back("-dynamic-linker");
- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +
- ToolChain.getDynamicLinker(Args)));
- }
}
}
CmdArgs.push_back("-o");
--
2.11.0

View file

@ -19,9 +19,9 @@
# LLVM release information; specify one of these but not both:
, gitRelease ? {
version = "18.0.0";
rev = "6f44f87011cd52367626cac111ddbb2d25784b90";
rev-version = "18.0.0-unstable-2023-10-04";
sha256 = "sha256-CqsCDlzg8I2c9BybKP7B5nfHiQWktqgVavrfiYkjkx4=";
rev = "2fd7657b6609454af7adb75765d164ec7d1bb80b";
rev-version = "18.0.0-unstable-2023-12-13";
sha256 = "sha256-/sMQzzFid0tAnreOIV9SUm2H6QbEGhpNcizl3LDPM5s=";
}
# i.e.:
# {

View file

@ -86,10 +86,14 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake ninja python ]
++ optionals enableManpages [
# Note: we intentionally use `python3Packages` instead of `python3.pkgs`;
# splicing does *not* work with the latter. (TODO: fix)
python3Packages.sphinx python3Packages.recommonmark
];
# Note: we intentionally use `python3Packages` instead of `python3.pkgs`;
# splicing does *not* work with the latter. (TODO: fix)
python3Packages.sphinx
] ++ optionals (lib.versionOlder version "18" && enableManpages) [
python3Packages.recommonmark
] ++ optionals (lib.versionAtLeast version "18" && enableManpages) [
python3Packages.myst-parser
];
buildInputs = [ libxml2 libffi ]
++ optional enablePFM libpfm; # exegesis

View file

@ -71,7 +71,7 @@ let
inherit executable luaversion;
luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; };
tests = callPackage ./tests { inherit (luaPackages) wrapLua; };
tests = callPackage ./tests { lua = self; inherit (luaPackages) wrapLua; };
inherit luaAttr;
};

View file

@ -8,9 +8,14 @@ function fail() {
}
function assertStringEqual {
function assertStringEqual() {
if ! diff <(echo "$1") <(echo "$2") ; then
fail "Strings differ"
fail "expected \"$1\" to be equal to \"$2\""
fi
}
function assertStringContains() {
if ! echo "$1" | grep -q "$2" ; then
fail "expected \"$1\" to contain \"$2\""
fi
}

View file

@ -8,7 +8,7 @@
let
runTest = lua: { name, command }:
pkgs.runCommandLocal "test-${lua.name}" ({
pkgs.runCommandLocal "test-${lua.name}-${name}" ({
nativeBuildInputs = [lua];
meta.platforms = lua.meta.platforms;
}) (''
@ -27,6 +27,10 @@ let
wrapLuaPrograms
'';
});
luaWithModule = lua.withPackages(ps: [
ps.lua-cjson
]);
in
pkgs.recurseIntoAttrs ({
@ -36,15 +40,29 @@ in
generated=$(lua -e 'print(package.path)')
golden_LUA_PATH='./share/lua/${lua.luaversion}/?.lua;./?.lua;./?/init.lua'
assertStringEqual "$generated" "$golden_LUA_PATH"
assertStringContains "$generated" "$golden_LUA_PATH"
'';
};
checkWrapping = pkgs.runCommandLocal "test-${lua.name}" ({
checkWrapping = pkgs.runCommandLocal "test-${lua.name}-wrapping" ({
}) (''
grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello
touch $out
'');
})
checkRelativeImports = pkgs.runCommandLocal "test-${lua.name}-relative-imports" ({
}) (''
source ${./assert.sh}
lua_vanilla_package_path="$(${lua}/bin/lua -e "print(package.path)")"
lua_with_module_package_path="$(${luaWithModule}/bin/lua -e "print(package.path)")"
assertStringContains "$lua_vanilla_package_path" "./?.lua"
assertStringContains "$lua_vanilla_package_path" "./?/init.lua"
assertStringContains "$lua_with_module_package_path" "./?.lua"
assertStringContains "$lua_with_module_package_path" "./?/init.lua"
touch $out
'');
})

View file

@ -23,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
./0001-Do-not-require-wget-and-unzip.patch
];
# Fix doc generation error with doxygen >= 1.10.0
# see https://github.com/eProsima/Fast-CDR/issues/193
postPatch = ''
substituteInPlace ./doxyfile.in --replace \
"WARN_AS_ERROR = YES" \
"WARN_AS_ERROR = NO"
'';
cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF"
# upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON)
++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON"

View file

@ -14,7 +14,9 @@
, useHDF ? (!useMinimalFeatures)
, useNetCDF ? (!useMinimalFeatures)
, useArmadillo ? (!useMinimalFeatures)
, useJava ? (!useMinimalFeatures)
, ant
, bison
, cmake
, gtest
@ -36,6 +38,7 @@
, libgeotiff
, geos
, giflib
, jdk
, libheif
, dav1d
, libaom
@ -94,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.setuptools
python3.pkgs.wrapPython
swig
];
] ++ lib.optionals useJava [ ant jdk ];
cmakeFlags = [
"-DGDAL_USE_INTERNAL_LIBS=OFF"
@ -110,6 +113,10 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
] ++ lib.optionals (!useTiledb) [
"-DGDAL_USE_TILEDB=OFF"
] ++ lib.optionals (!useJava) [
# This is not strictly needed as the Java bindings wouldn't build anyway if
# ant/jdk were not available.
"-DBUILD_JAVA_BINDINGS=OFF"
];
buildInputs =
@ -144,7 +151,8 @@ stdenv.mkDerivation (finalAttrs: {
openexr
xercesc
] ++ arrowDeps);
in [
in
[
c-blosc
brunsli
cfitsio
@ -178,20 +186,24 @@ stdenv.mkDerivation (finalAttrs: {
python3
python3.pkgs.numpy
] ++ tileDbDeps
++ libHeifDeps
++ libJxlDeps
++ mysqlDeps
++ postgresDeps
++ popplerDeps
++ arrowDeps
++ hdfDeps
++ netCdfDeps
++ armadilloDeps
++ darwinDeps
++ nonDarwinDeps;
++ libHeifDeps
++ libJxlDeps
++ mysqlDeps
++ postgresDeps
++ popplerDeps
++ arrowDeps
++ hdfDeps
++ netCdfDeps
++ armadilloDeps
++ darwinDeps
++ nonDarwinDeps;
postInstall = ''
wrapPythonPrograms
'' + lib.optionalString useJava ''
cd $out/lib
ln -s ./jni/libgdalalljni${stdenv.hostPlatform.extensions.sharedLibrary}
cd -
'';
enableParallelBuilding = true;

View file

@ -1,4 +1,4 @@
{ runCommand, gdal }:
{ runCommand, gdal, jdk }:
let
inherit (gdal) pname version;
@ -40,5 +40,16 @@ runCommand "${pname}-tests" { meta.timeout = 60; }
${gdal}/bin/gdalinfo ./test.tif
# test java bindings
cat <<EOF > main.java
import org.gdal.gdal.gdal;
class Main {
public static void main(String[] args) {
gdal.AllRegister();
}
}
EOF
${jdk}/bin/java -Djava.library.path=${gdal}/lib/ -cp ${gdal}/share/java/gdal-${version}.jar main.java
touch $out
''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "libcxxrt";
version = "unstable-2023-10-11";
version = "unstable-2024-02-05";
src = fetchFromGitHub {
owner = "libcxxrt";
repo = "libcxxrt";
rev = "03c83f5a57be8c5b1a29a68de5638744f17d28ba";
sha256 = "ldwE0j9P9h5urWIUCRdY6qrJqKe45hid+NrSNeKEixE=";
rev = "bd4fa85d7f772f2ad32146d5681c91612fc93842";
sha256 = "2F6MmLfKyFl7HzdTb1NDBVHMSRVzVhcib93JVaR58Qw=";
};
nativeBuildInputs = [ cmake ];

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libremidi";
version = "3.0";
version = "4.2.4";
src = fetchFromGitHub {
owner = "jcelerier";
repo = "libremidi";
rev = "v${version}";
hash = "sha256-aO83a0DmzwjYXDlPIsn136EkDF0406HadTXPoGuVF6I=";
hash = "sha256-AWONCZa4tVZ7HMze9WSVzHQUXIrn1i6ZZ4Hgufkrep8=";
};
nativeBuildInputs = [ cmake ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ntbtls";
version = "0.3.1";
version = "0.3.2";
src = fetchurl {
url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2";
sha256 = "sha256-iSIYH+9SO3e3FiXlYuTWlTInjqu9GLx0V52+FBNXKbo=";
sha256 = "sha256-vfy5kCSs7JxsS5mK1juzkh30z+5KdyrWwMoyTbvysHw=";
};
outputs = [ "dev" "out" ];

View file

@ -0,0 +1,61 @@
{ stdenv
, lib
, fetchFromGitLab
, substituteAll
, meson
, pkg-config
, qttools
, ninja
, qtbase
, qtwayland
, wayland
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wayqt";
version = "0.2.0";
src = fetchFromGitLab {
owner = "desktop-frameworks";
repo = "wayqt";
rev = "v${finalAttrs.version}";
hash = "sha256-qlRRkqhKlcsd9lzlqfE0V0gjudELyENu4IH1NfO/+pI=";
};
patches = [
# qmake get qtbase's path, but wayqt need qtwayland
(substituteAll {
src = ./fix-qtwayland-header-path.diff;
qtWaylandPath = "${qtwayland}/include";
})
];
nativeBuildInputs = [
meson
pkg-config
qttools
ninja
];
buildInputs = [
qtbase
qtwayland
wayland
];
mesonFlags = [
"-Duse_qt_version=qt6"
];
dontWrapQtApps = true;
outputs = [ "out" "dev" ];
meta = {
homepage = "https://gitlab.com/desktop-frameworks/wayqt";
description = "Qt-based library to handle Wayland and Wlroots protocols to be used with any Qt project";
maintainers = with lib.maintainers; [ rewine ];
platforms = lib.platforms.linux;
license = lib.licenses.mit;
};
})

View file

@ -0,0 +1,16 @@
diff --git a/meson.build b/meson.build
index 5c09644..fc65d37 100644
--- a/meson.build
+++ b/meson.build
@@ -39,9 +39,8 @@ elif get_option('use_qt_version') == 'qt6'
private_headers: [ 'Gui', 'WaylandClient', 'WaylandGlobalPrivate' ],
)
- qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: true )
- ret = run_command( qmake, '-query', 'QT_INSTALL_HEADERS', check: true )
- QtHeaderPath = ret.stdout().strip()
+ qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: false )
+ QtHeaderPath = '@qtWaylandPath@'
QtGlobal = '@0@/QtWaylandGlobal/@1@'.format( QtHeaderPath, QtDeps.version() )

View file

@ -70,7 +70,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.42.4";
version = "2.42.5";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
outputs = [ "out" "dev" "devdoc" ];
@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-UiiLML2iI3NELOy4b5yaVprY1HaaH5ezUikO2Spn7YY=";
hash = "sha256-tkJ4wfILjP2/tf9XPDfYcaunSh2ybZs5906JU/5h50k=";
};
patches = lib.optionals stdenv.isLinux [

View file

@ -15,13 +15,13 @@ let
in
stdenv.mkDerivation rec {
pname = "webp-pixbuf-loader";
version = "0.2.2";
version = "0.2.6";
src = fetchFromGitHub {
owner = "aruiz";
repo = "webp-pixbuf-loader";
rev = version;
sha256 = "sha256-TdZK2OTwetLVmmhN7RZlq2NV6EukH1Wk5Iwer2W/aHc=";
sha256 = "sha256-2GDH5+YCwb2mPdMfEscmWDOzdGnWRcppE+4rcDCZog4=";
};
nativeBuildInputs = [

View file

@ -3455,6 +3455,37 @@ buildLuarocksPackage {
};
}) {};
xml2lua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }:
buildLuarocksPackage {
pname = "xml2lua";
version = "1.5-2";
knownRockspec = (fetchurl {
url = "mirror://luarocks/xml2lua-1.5-2.rockspec";
sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/manoelcampos/xml2lua",
"rev": "b24be89a154d49b33295958584944bfd7ba2b24e",
"date": "2021-07-13T10:22:09-03:00",
"path": "/nix/store/i5dvpc0mhhw7jbrvg4bsz1scs0kvmx5f-xml2lua",
"sha256": "1vk3chcpq8b98dss5kwskbzxig58zar0jgi8mizdccw4rx698c44",
"hash": "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4=",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
'') ["date" "path" "sha256"]) ;
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "http://manoelcampos.github.io/xml2lua/";
description = "An XML Parser written entirely in Lua that works for Lua 5.1+";
license.fullName = "MIT";
};
}) {};
}
/* GENERATED - do not edit this file */

File diff suppressed because it is too large Load diff

View file

@ -412,40 +412,40 @@ final: prev: {
name = "_at_cloudflare_slash_workerd-linux-64";
packageName = "@cloudflare/workerd-linux-64";
# Should be same version as workerd
version = "1.20231030.0";
version = "1.20240129.0";
src = fetchurl {
url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20231030.0.tgz";
sha512 = "2HUeRTvoCC17fxE0qdBeR7J9dO8j4A8ZbdcvY8pZxdk+zERU6+N03RTbk/dQMU488PwiDvcC3zZqS4gwLfVT8g==";
url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240129.0.tgz";
sha512 = "sFV1uobHgDI+6CKBS/ZshQvOvajgwl6BtiYaH4PSFSpvXTmRx+A9bcug+6BnD+V4WgwxTiEO2iR97E1XuwDAVw==";
};
};
linuxWorkerdArm = {
name = "_at_cloudflare_slash_workerd-linux-arm64";
packageName = "@cloudflare/workerd-linux-arm64";
# Should be same version as workerd
version = "1.20231030.0";
version = "1.20240129.0";
src = fetchurl {
url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20231030.0.tgz";
sha512 = "4/GK5zHh+9JbUI6Z5xTCM0ZmpKKHk7vu9thmHjUxtz+o8Ne9DoD7DlDvXQWgMF6XGaTubDWyp3ttn+Qv8jDFuQ==";
url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240129.0.tgz";
sha512 = "O7q7htHaFRp8PgTqNJx1/fYc3+LnvAo6kWWB9a14C5OWak6AAZk42PNpKPx+DXTmGvI+8S1+futBGUeJ8NPDXg==";
};
};
darwinWorkerd = {
name = "_at_cloudflare_slash_workerd-darwin-64";
packageName = "@cloudflare/workerd-darwin-64";
# Should be same version as workerd
version = "1.20231030.0";
version = "1.20240129.0";
src = fetchurl {
url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20231030.0.tgz";
sha512 = "0iy34j997llj3jl3l8dipnsyms89qv9nxkza9l2gxmcj6mqwv5m6c8cvgca78qfccl1f5zsrzj855q1fz631p91yydbri2gxgvd10r7";
url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240129.0.tgz";
sha512 = "DfVVB5IsQLVcWPJwV019vY3nEtU88c2Qu2ST5SQxqcGivZ52imagLRK0RHCIP8PK4piSiq90qUC6ybppUsw8eg==";
};
};
darwinWorkerdArm = {
name = "_at_cloudflare_slash_workerd-darwin-arm64";
packageName = "@cloudflare/workerd-darwin-arm64";
# Should be same version as workerd
version = "1.20231030.0";
version = "1.20240129.0";
src = fetchurl {
url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20231030.0.tgz";
sha512 = "WSJJjm11Del4hSneiNB7wTXGtBXI4QMCH9l5qf4iT5PAW8cESGcCmdHtWDWDtGAAGcvmLT04KNvmum92vRKKQQ==";
url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240129.0.tgz";
sha512 = "t0q8ABkmumG1zRM/MZ/vIv/Ysx0vTAXnQAPy/JW5aeQi/tqrypXkO9/NhPc0jbF/g/hIPrWEqpDgEp3CB7Da7Q==";
};
};

View file

@ -1,19 +1,17 @@
{ lib, fetchFromGitHub, pkg-config, buildDunePackage, dune-configurator
{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator
, gtk3, cairo2
, camlp-streams
}:
buildDunePackage rec {
version = "3.1.3";
version = "3.1.4";
pname = "lablgtk3";
minimalOCamlVersion = "4.05";
src = fetchFromGitHub {
owner = "garrigue";
repo = "lablgtk";
rev = version;
sha256 = "sha256-1kXJP+tKudP3qfosTgZAQueNK46H9aLevEj6wxPKDWY=";
src = fetchurl {
url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";
hash = "sha256-bxEVMzfnaH5yHVxAmifNYOy8GnSivLLgSE/9+1yxBI4=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -0,0 +1,20 @@
{ buildDunePackage
, dune-configurator
, lablgtk3
, librsvg
, pkg-config
}:
buildDunePackage rec {
pname = "lablgtk3-rsvg2";
inherit (lablgtk3) version src;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ lablgtk3 librsvg ];
meta = lablgtk3.meta // {
description = "OCaml interface to Gnome rsvg2 library";
};
}

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uucp, uutf, cmdliner
, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0"
, cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"
}:
@ -10,11 +11,14 @@ in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "15.0.0";
inherit version;
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
hash = {
"15.1.0" = "sha256-IPI3Wd51HzX4n+uGcgc04us29jMjnKbGgVEAdp0CVMU=";
"15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
}."${version}";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

View file

@ -678,7 +678,7 @@ dependencies = [
[[package]]
name = "datadog-php-profiling"
version = "0.96.0"
version = "0.97.0"
dependencies = [
"ahash 0.8.3",
"anyhow",

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