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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-18 00:02:35 +00:00
committed by GitHub
parent 859d7e12c2 b621273236
commit d4965b9a2a
48 changed files with 5384 additions and 4697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/backport.yml
+1 -1
View File
@@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
uses: korthout/backport-action@v1.2.0
uses: korthout/backport-action@v1.3.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity'
maintainers/maintainer-list.nix
+7
View File
@@ -5795,6 +5795,13 @@
githubId = 48872998;
name = "Seth";
};
getpsyched = {
name = "Priyanshu Tripathi";
email = "priyanshutr@proton.me";
matrix = "@getpsyched:matrix.org";
github = "getpsyched";
githubId = 43472218;
};
gfrascadorio = {
email = "gfrascadorio@tutanota.com";
github = "gfrascadorio";
nixos/modules/services/hardware/fwupd.nix
+4 -7
View File
@@ -13,16 +13,13 @@ let
};
customEtc = {
"fwupd/daemon.conf" = {
source = format.generate "daemon.conf" {
"fwupd/fwupd.conf" = {
source = format.generate "fwupd.conf" {
fwupd = cfg.daemonSettings;
};
};
"fwupd/uefi_capsule.conf" = {
source = format.generate "uefi_capsule.conf" {
uefi_capsule = cfg.uefiCapsuleSettings;
};
# fwupd tries to chmod the file if it doesn't have the right permissions
mode = "0640";
};
};
pkgs/applications/audio/osdlyrics/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "osdlyrics";
version = "0.5.13";
version = "0.5.14";
src = fetchFromGitHub {
owner = "osdlyrics";
repo = "osdlyrics";
rev = version;
sha256 = "sha256-E4pVXopqQYJW+a5nUf9dMabxJ9nYPu3C2ti8LlY470c=";
sha256 = "sha256-NVUQLmddXnpryt1AuHSwgPnWkgxWMBNJac09TJ12Yzo=";
};
nativeBuildInputs = [
pkgs/applications/misc/dbeaver/default.nix
+12 -7
View File
@@ -19,26 +19,31 @@
, javaPackages
}:
let
mavenJdk17 = maven.override {
jdk = jdk17;
};
in
(javaPackages.mavenfod.override {
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
maven = mavenJdk17;
}) rec {
pname = "dbeaver";
version = "22.2.2"; # When updating also update mvnSha256
version = "22.2.2"; # When updating also update mvnHash
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
hash = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
};
mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo=";
mvnHash = "sha256-87pf7XRXCuZlAbL54pX+a5Lo/874DmUr/W37/V+5YpQ=";
mvnParameters = "-P desktop,all-platforms";
nativeBuildInputs = [
copyDesktopItems
makeWrapper
maven
mavenJdk17
];
buildInputs = [
@@ -76,7 +81,7 @@
aarch64-darwin = "aarch64";
aarch64-linux = "aarch64";
x86_64-darwin = "x86_64";
x86_64-linux = "x86_64";
x86_64-linux = "x86_64";
};
systemPlatform = platformMap.${stdenv.hostPlatform.system} or (throw "dbeaver not supported on ${stdenv.hostPlatform.system}");
@@ -129,7 +134,7 @@
'';
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # dependencies from maven
binaryBytecode # dependencies from maven
];
license = licenses.asl20;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
pkgs/applications/networking/browsers/lagrange/default.nix
+2 -13
View File
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, nix-update-script
, cmake
, pkg-config
@@ -18,25 +17,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.16.3";
version = "1.16.4";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
hash = "sha256-DpgCxnwkNP2mZNYygxFLMufEijYoLr4qor0DYCmbps8=";
hash = "sha256-crOUuCQwqB1Eaesx7jXUd3/ti1LGMOjjESiOJjg/iZo=";
};
patches = [
# fixes `lagrange-tui`
# remove when 1.64.4 comes out
(fetchpatch {
name = "tui-fixed-build-after-changes-to-text-init.patch";
url = "https://github.com/skyjake/lagrange/commit/1c811221acc5b8eb47210fba90dc3a789a093e9b.patch";
hash = "sha256-K0njCcEOOYAwo3FI8eBg53Qo8J/iNBqCn3WCKQb0cgk=";
})
];
nativeBuildInputs = [ cmake pkg-config zip ];
buildInputs = [ the-foundation ]
pkgs/applications/office/portfolio/default.nix
+2 -2
View File
@@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
version = "0.63.1";
version = "0.64.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
hash = "sha256-zMlRxj10NS47Q88UWM1s0WvhhQXS4I00JyzmigyYOmE=";
hash = "sha256-8LebPYIML3YV8DsoLPQiH4Q6ETBTgZ7IpeGJDN2R7ro=";
};
nativeBuildInputs = [
pkgs/applications/science/chemistry/openmolcas/default.nix
+3 -3
View File
@@ -15,14 +15,14 @@ let
in stdenv.mkDerivation {
pname = "openmolcas";
version = "23.02";
version = "23.06";
src = fetchFromGitLab {
owner = "Molcas";
repo = "OpenMolcas";
# The tag keeps moving, fix a hash instead
rev = "03265f62cd98b985712b063aea88313f984a8857"; # 2023-02-11
sha256 = "sha256-Kj2RDJq8PEvKclLrSYIOdl6g6lcRsTNZCjwxGOs3joY=";
rev = "1cda3772686cbf99a4af695929a12d563c795ca2"; # 2023-06-12
sha256 = "sha256-6AAagMWRwxdoxAMpwH6efVHaq8501U2bkQank4tdsA8=";
};
patches = [
pkgs/applications/science/logic/egglog/Cargo.lock
Generated
+2 -2
View File
@@ -185,7 +185,7 @@ dependencies = [
]
[[package]]
name = "egg-smol"
name = "egglog"
version = "0.1.0"
dependencies = [
"clap",
@@ -906,7 +906,7 @@ name = "web-demo"
version = "0.1.0"
dependencies = [
"console_error_panic_hook",
"egg-smol",
"egglog",
"js-sys",
"log",
"wasm-bindgen",
pkgs/applications/science/logic/egglog/default.nix
+3 -4
View File
@@ -5,13 +5,13 @@
rustPlatform.buildRustPackage {
pname = "egglog";
version = "unstable-2023-05-22";
version = "unstable-2023-06-11";
src = fetchFromGitHub {
owner = "egraphs-good";
repo = "egglog";
rev = "5242b50051c339d55009860d4dff80125fdcedfd";
hash = "sha256-N04CfITLEr4D4s6bUi0eRQdAVy6Ztq3Ml0365of7i0U=";
rev = "c7ef8b000caf7fa17f6127847db4b9c285c03f09";
hash = "sha256-OGuqC/HgH7UhUhW5RU8nkqj6roPjXXOyVRHmnJdIolg=";
};
cargoLock = {
@@ -27,6 +27,5 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/egraphs-good/egglog";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "egg-smol";
};
}
pkgs/data/fonts/lxgw-neoxihei/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-neoxihei";
version = "1.010";
version = "1.101";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
hash = "sha256-IIiQn2Qlac4ZFy/gVubrpqEpJIt0Dav2TEL29xDC7w4=";
hash = "sha256-6zce11KtVKpjjzXkXYzBjfqME55LRvkpS28ZrcLo4W0=";
};
dontUnpack = true;
pkgs/development/compilers/bfc/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "bfc";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "bfc";
rev = version;
hash = "sha256-pPx9S7EnrL6aIvLlrCjGDKNYLhzd6ud1RvN+qCiZGXk=";
hash = "sha256-uRQP3LS7cpG85BilkSaI+2WbEp/6zZcFrryMNO+n6EA=";
};
cargoHash = "sha256-2m21FdSSFC6MsOeofHk6P4yGR3wZ3siLQTAtl4UbDBQ=";
cargoHash = "sha256-aQLUZzHBy5CBbp5SpsS5dFQYpD7Bc+4zTfLjA/nmMnE=";
buildInputs = [
libxml2
pkgs/development/java-modules/maven-fod.nix
+2 -2
View File
@@ -4,12 +4,12 @@
}:
{ src
, patches ? []
, patches ? [ ]
, pname
, version
, mvnSha256 ? "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
, mvnHash ? "sha256-${mvnSha256}"
, mvnFetchExtraArgs ? {}
, mvnFetchExtraArgs ? { }
, mvnParameters ? ""
, ...
} @args:
pkgs/development/libraries/codec2/default.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "codec2";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "drowe67";
repo = "codec2";
rev = "v${version}";
hash = "sha256-7E/Iqan3DVFl9pwsY6pwWM64ug1cjN6DH+u7XzraA78=";
hash = "sha256-p1WMp17PCnr50bXDSd6A4Je7AfKVHuLmyEue9221zPs=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/pico-sdk/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pico-sdk";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = version;
sha256 = "sha256-p69go8KXQR21szPb+R1xuonyFj+ZJDunNeoU7M3zIsE=";
sha256 = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/dataclasses-json/default.nix
+3 -3
View File
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "dataclasses-json";
version = "0.5.7";
version = "0.5.9";
src = fetchFromGitHub {
owner = "lidatong";
repo = pname;
rev = "v${version}";
sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j";
rev = "refs/tags/v${version}";
sha256 = "sha256-2/J+d7SQvUs7nXw1n+qwy0DQCplK28eUrbP7+yQPB7g=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/nunavut/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "nunavut";
version = "2.1.0";
version = "2.1.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-L4FbPhhhmgjkL1c3qnSJDK+4NBO2DUqeW6WGt9MBTbg=";
hash = "sha256-ENP1uhzQwFEk990b1RX2wNVpInaSSH80KNihX6XpQtU=";
};
postPatch = ''
pkgs/development/python-modules/xml2rfc/default.nix
+2 -2
View File
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "3.17.2";
version = "3.17.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "ietf-tools";
repo = "xml2rfc";
rev = "refs/tags/v${version}";
hash = "sha256-LwM0lfBJNSCMsa0AiGBRmuihc/kSLYQ4V6hgY5fM6/w=";
hash = "sha256-5RL4DkWcQRxzi1dhSJlGgoU0BU3aUWOfBNINFKiOwLg=";
};
postPatch = ''
pkgs/development/tools/language-servers/helm-ls/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "helm-ls";
version = "0.0.3";
version = "0.0.4";
src = fetchFromGitHub {
owner = "mrjosh";
repo = "helm-ls";
rev = "v${version}";
hash = "sha256-MiDbV+mfr1wcc0e0iwFPL8WniWKbPnr4zb79qniT2Kc=";
hash = "sha256-1hzAfmeHLjgvySrEVONnFG/UAEFVAYbUAYEgzOF29b0=";
};
vendorHash = "sha256-EqZlmOoQtC3Iuf0LG2PL0K2pluGqbyA6132lzgF4+ic=";
vendorHash = "sha256-hYEQUaE1njzs1Miv/ux7Yw6npLEUfcb/wKyL+j5Zrwg=";
nativeBuildInputs = [ installShellFiles ];
pkgs/development/tools/language-servers/typst-lsp/Cargo.lock
Generated
+502 -158
View File
File diff suppressed because it is too large Load Diff
pkgs/development/tools/language-servers/typst-lsp/default.nix
+10 -4
View File
@@ -5,13 +5,13 @@
rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
version = "0.5.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "nvarner";
repo = pname;
rev = "v${version}";
hash = "sha256-UY7HfUNssOgEuBBPpUFJZs1TM4IT0/kRcjqrXPFoShI=";
hash = "sha256-RYFIJYgyBe0WhNEP1cDI7JvM4Ka+39uyOx5pcpWhq3I=";
};
cargoLock = {
@@ -19,11 +19,17 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"elsa-1.8.1" = "sha256-/85IriplPxx24TE/CsvjIsve100QUZiVqS0TWgPFRbw=";
"svg2pdf-0.4.1" = "sha256-WeVP+yhqizpTdRfyoj2AUxFKhGvVJIIiRV0GTXkgLtQ=";
"typst-0.4.0" = "sha256-S8J2D87Zvyh501d8LG69in9om/nTS6Y+IDhJvjm/H0w=";
"typst-0.5.0" = "sha256-obUe9OVQ8M7MORudQGN7zaYjUv4zjeh7XidHHmUibTA=";
};
};
cargoHash = "sha256-ISkw0lhUKJG8nWUHcR93sLUFt5dDEyK7EORcOXEmVbE=";
patches = [
# typst-library tries to access the workspace with include_bytes, which
# fails when it is vendored as its own separate crate
# this patch moves the required assets into the crate and fixes the issue
# see https://github.com/typst/typst/pull/1515
./move-typst-assets.patch
];
meta = with lib; {
description = "A brand-new language server for Typst";
pkgs/development/tools/language-servers/typst-lsp/move-typst-assets.patch
+40
View File
@@ -0,0 +1,40 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1873,7 +1873,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
[[package]]
name = "typst"
version = "0.5.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
+source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
dependencies = [
"bitflags 2.3.1",
"bytemuck",
@@ -1915,7 +1915,7 @@ dependencies = [
[[package]]
name = "typst-library"
version = "0.5.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
+source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
dependencies = [
"az",
"chinese-number",
@@ -1983,7 +1983,7 @@ dependencies = [
[[package]]
name = "typst-macros"
version = "0.5.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.5.0#3a8b9cce471934031ba57c5972d194ac1d7d2a6c"
+source = "git+https://github.com/typst/typst.git?rev=30bb33aafced4f1bf4a00803550f0e1e42672ded#30bb33aafced4f1bf4a00803550f0e1e42672ded"
dependencies = [
"heck",
"proc-macro2",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,6 +32,6 @@ tokio = { version = "1.26.0", features = [
"io-std",
] }
tower-lsp = "0.19.0"
-typst = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" }
-typst-library = { git = "https://github.com/typst/typst.git", tag = "v0.5.0" }
+typst = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" }
+typst-library = { git = "https://github.com/typst/typst.git", rev = "30bb33aafced4f1bf4a00803550f0e1e42672ded" }
walkdir = "2.3"
pkgs/development/tools/misc/rsonpath/default.nix
+4 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "rsonpath";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "v0ldek";
repo = "rsonpath";
rev = "v${version}";
hash = "sha256-F52IUTfQ2h5z0+WeLNCCmX8vre58ayncW4/lxIwo/T8=";
hash = "sha256-J/KdnPvGZb1Y1IgcjtU2ZxzurjoUjo3oKVnxGeNwHHc=";
};
cargoHash = "sha256-WY6wXnPh0rgjSkNMWOeOCl//kHlDk0z6Gvnjax33nvE=";
cargoHash = "sha256-npnTXnRz2ktTc5c7p8vINdFwGJcbsRQ21D6lmtddl7Y=";
buildNoDefaultFeatures = true;
buildFeatures = [
@@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "rq";
};
}
pkgs/development/tools/rain/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "rain";
version = "1.4.0";
version = "1.4.2";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qSzsipGXBxLkdVC4mqq4KhTtyo4+Y/TlgKbGkm1HlK8=";
sha256 = "sha256-l+iTQo5rLb+IYQ3DLugnLAw/q3pO5dh0Et8Ha3HCK+4=";
};
vendorHash = "sha256-n1Hxd2SE8JhLqII+neOzeB94KQ7b/Gm1kXCtP8AuWYk=";
pkgs/games/atlauncher/default.nix
+57
View File
@@ -0,0 +1,57 @@
{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, steam-run, withSteamRun ? true, writeShellScript }:
stdenv.mkDerivation (finalAttrs: {
pname = "atlauncher";
version = "3.4.28.1";
src = fetchurl {
url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar";
hash = "sha256-IIwDMazxUMQ7nGQk/4VEZicgCmCR4oR8UYtO36pCEq4=";
};
dontUnpack = true;
buildInputs = [ ];
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
installPhase =
let
# hack to use steam-run along with the exec
steamrun = writeShellScript "steamrun" ''
shift
exec ${steam-run}/bin/steam-run "''$@"
'';
in
''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/atlauncher \
--add-flags "-jar $src --working-dir=\$HOME/.atlauncher" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ${
lib.strings.optionalString withSteamRun ''--run "${steamrun} \\"''
}
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = finalAttrs.pname;
exec = finalAttrs.pname;
icon = fetchurl {
url = "https://avatars.githubusercontent.com/u/7068667";
hash = "sha256-YmEkxf4rZxN3jhiib0UtdUDDcn9lw7IMbiEucBL7b9o=";
};
desktopName = "ATLauncher";
categories = [ "Game" ];
})
];
meta = with lib; {
description = "A simple and easy to use Minecraft launcher which contains many different modpacks for you to choose from and play";
downloadPage = "https://atlauncher.com/downloads";
homepage = "https://atlauncher.com/";
license = licenses.gpl3;
maintainers = [ maintainers.getpsyched ];
platforms = platforms.all;
};
})
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+20 -65
View File
@@ -1,5 +1,5 @@
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
index b0ff5b106..13ac380d0 100644
index b0ff5b10..13ac380d 100644
--- a/data/bios-settings.d/meson.build
+++ b/data/bios-settings.d/meson.build
@@ -1,5 +1,5 @@
@@ -10,20 +10,20 @@ index b0ff5b106..13ac380d0 100644
)
endif
diff --git a/data/meson.build b/data/meson.build
index 865b20e26..ff1c2657b 100644
index 8999ee57..b57174dc 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,7 +26,7 @@ endif
if build_standalone
install_data(['daemon.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
install_data(['fwupd.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
install_mode: 'rw-r-----',
)
plugin_quirks += files([
'power.quirk',
diff --git a/data/pki/meson.build b/data/pki/meson.build
index 3649fecea..c3462744b 100644
index 3649fece..c3462744 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
@@ -12,13 +12,13 @@ install_data([
@@ -41,7 +41,7 @@ index 3649fecea..c3462744b 100644
+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
)
endif
@@ -26,11 +26,11 @@ if supported_pkcs7
install_data([
'LVFS-CA.pem',
@@ -57,7 +57,7 @@ index 3649fecea..c3462744b 100644
)
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index c20a1a05e..87b1fa930 100644
index c20a1a05..5354bac7 100644
--- a/data/remotes.d/meson.build
+++ b/data/remotes.d/meson.build
@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false'
@@ -77,7 +77,7 @@ index c20a1a05e..87b1fa930 100644
)
i18n.merge_file(
input: 'lvfs.metainfo.xml',
@@ -54,12 +54,12 @@ configure_file(
@@ -56,12 +56,12 @@ configure_file(
output: 'vendor.conf',
configuration: con2,
install: true,
@@ -93,13 +93,13 @@ index c20a1a05e..87b1fa930 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index d3e08af43..30011f548 100644
index fa7a5599..5b53a407 100644
--- a/meson.build
+++ b/meson.build
@@ -193,6 +193,12 @@ endif
@@ -191,6 +191,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
+if get_option('sysconfdir_install') != ''
+ sysconfdir_install = join_paths(prefix, get_option('sysconfdir_install'))
+else
@@ -109,8 +109,9 @@ index d3e08af43..30011f548 100644
diffcmd = find_program('diff')
gio = dependency('gio-2.0', version: '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index 204690640..6fc7e8437 100644
index 81d373f8..d214cf64 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
@@ -119,7 +120,7 @@ index 204690640..6fc7e8437 100644
option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'})
option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support')
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index 88c039f85..62a7691f3 100644
index 88c039f8..62a7691f 100644
--- a/plugins/dell-esrt/meson.build
+++ b/plugins/dell-esrt/meson.build
@@ -27,6 +27,6 @@ configure_file(
@@ -130,47 +131,8 @@ index 88c039f85..62a7691f3 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
endif
diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build
index 23ec5ec82..b03826fc0 100644
--- a/plugins/msr/meson.build
+++ b/plugins/msr/meson.build
@@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'],
endif
install_data(['msr.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
plugin_builtins += static_library('fu_plugin_msr',
sources: [
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
index 1e35b6ce9..33ca1447f 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -35,7 +35,7 @@ plugin_builtin_redfish = static_library('fu_plugin_redfish',
plugin_builtins += plugin_builtin_redfish
install_data(['redfish.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
install_mode: 'rw-r-----',
)
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
index 71d930e62..399fb5781 100644
--- a/plugins/thunderbolt/meson.build
+++ b/plugins/thunderbolt/meson.build
@@ -19,7 +19,7 @@ plugin_builtin_thunderbolt = static_library('fu_plugin_thunderbolt',
plugin_builtins += plugin_builtin_thunderbolt
install_data(['thunderbolt.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
# we use functions from 2.52 in the tests
if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
index b4b038313..9c5407c3f 100644
index f4657a6a..28ca0653 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -20,7 +20,7 @@ if host_machine.system() == 'linux'
@@ -182,12 +144,5 @@ index b4b038313..9c5407c3f 100644
)
elif host_machine.system() == 'freebsd'
backend_srcs += 'fu-uefi-backend-freebsd.c'
@@ -87,7 +87,7 @@ if get_option('compat_cli') and get_option('man')
endif
install_data(['uefi_capsule.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
# add all the .po files as inputs to watch
--
2.40.1
pkgs/os-specific/linux/firmware/fwupd/default.nix
+6 -11
View File
@@ -58,6 +58,7 @@
let
python = python3.withPackages (p: with p; [
jinja2
pygobject3
setuptools
]);
@@ -122,7 +123,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.8.15";
version = "1.9.2";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -133,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-M7uCT8xJ6ym0X6iAgT3rM2ki0T6QgLJWlFU39aC64o4=";
hash = "sha256-ESBTT7KO4WZKS5ArXZI0pxQpfFK4h4HbClaITm5bxfU=";
};
patches = [
@@ -261,6 +262,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs \
contrib/generate-version-script.py \
contrib/generate-man.py \
po/test-deps
substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \
@@ -337,12 +339,11 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
filesInstalledToEtc = [
"fwupd/bios-settings.d/README.md"
"fwupd/daemon.conf"
"fwupd/fwupd.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
"fwupd/remotes.d/vendor-directory.conf"
"fwupd/uefi_capsule.conf"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd/LVFS-CA.pem"
@@ -352,12 +353,6 @@ stdenv.mkDerivation (finalAttrs: {
"grub.d/35_fwupd"
] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
] ++ lib.optionals haveRedfish [
"fwupd/redfish.conf"
] ++ lib.optionals haveMSR [
"fwupd/msr.conf"
] ++ lib.optionals isx86 [
"fwupd/thunderbolt.conf"
];
# DisabledPlugins key in fwupd/daemon.conf
@@ -392,7 +387,7 @@ stdenv.mkDerivation (finalAttrs: {
assert len(passthru_etc - package_etc) == 0, f'fwupd package lists the following paths in passthru.filesInstalledToEtc that are not contained in /etc: {passthru_etc - package_etc}'
config = configparser.RawConfigParser()
config.read('${finalAttrs.finalPackage}/etc/fwupd/daemon.conf')
config.read('${finalAttrs.finalPackage}/etc/fwupd/fwupd.conf')
package_disabled_plugins = config.get('fwupd', 'DisabledPlugins').rstrip(';').split(';')
passthru_disabled_plugins = ${listToPy finalAttrs.passthru.defaultDisabledPlugins}
assert package_disabled_plugins == passthru_disabled_plugins, f'Default disabled plug-ins in the package {package_disabled_plugins} do not match those listed in passthru.defaultDisabledPlugins {passthru_disabled_plugins}'
pkgs/os-specific/linux/mmc-utils/default.nix
+3 -3
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "mmc-utils";
version = "unstable-2023-04-17";
version = "unstable-2023-06-12";
src = fetchzip rec {
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz";
passthru.rev = "145c74ab6f2e13a9a8ccdbbf1758afedb8a3965c";
sha256 = "cYLIO83uZHDe1COKtSN0SyFOoC3qrqMP0RNsOO9cQ70=";
passthru.rev = "6d593efc3cd00e4debd0ffc5806246390dc66242";
sha256 = "QOrU47cTPnvJHM40Bjq51VSSinmRnXCimk1h5mt4vNw=";
};
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ];
pkgs/servers/sunshine/default.nix
+3 -9
View File
@@ -3,7 +3,6 @@
, callPackage
, fetchFromGitHub
, fetchurl
, fetchpatch
, autoPatchelfHook
, makeWrapper
, buildNpmPackage
@@ -44,31 +43,26 @@ let
in
stdenv.mkDerivation rec {
pname = "sunshine";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "LizardByte";
repo = "Sunshine";
rev = "v${version}";
sha256 = "sha256-fifwctVrSkAcMK8juAirIbIP64H7GKEwC+sUR/U6Q3Y=";
sha256 = "sha256-/ceN44PAEtXzrAUi4AEldW1FBhJqIXah1Zd0S6fiV3s=";
fetchSubmodules = true;
};
# remove pre-built ffmpeg; use ffmpeg from nixpkgs
patches = [
./ffmpeg.diff
# fix for X11 not being added to libraries unless prebuilt FFmpeg is used: https://github.com/LizardByte/Sunshine/pull/1166
(fetchpatch {
url = "https://github.com/LizardByte/Sunshine/commit/a067da6cae72cf36f76acc06fcf1e814032af886.patch";
sha256 = "sha256-HMxM7luiFBEmFkvQtkdAMMSjAaYPEFX3LL0T/ActUhM=";
})
];
# fetch node_modules needed for webui
ui = buildNpmPackage {
inherit src version;
pname = "sunshine-ui";
npmDepsHash = "sha256-sdwvM/Irejo8DgMHJWWCxwOykOK9foqLFFd/tuzrkxI=";
npmDepsHash = "sha256-pwmkpZjDwluKJjcY0ehetQbAlFnj1tsW100gRjolboc=";
dontNpmBuild = true;
pkgs/servers/sunshine/ffmpeg.diff
+14 -12
View File
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1842c67..8afd0e9 100644
index ccca6fc..8789a4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -280,6 +280,8 @@ else()
@@ -349,6 +349,8 @@ else()
set(WAYLAND_FOUND OFF)
endif()
@@ -10,10 +10,10 @@ index 1842c67..8afd0e9 100644
+
if(X11_FOUND)
add_compile_definitions(SUNSHINE_BUILD_X11)
include_directories(${X11_INCLUDE_DIR})
@@ -451,51 +453,12 @@ set_source_files_properties(src/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic)
set_source_files_properties(third-party/nanors/rs.c
PROPERTIES COMPILE_FLAGS "-include deps/obl/autoshim.h -ftree-vectorize")
include_directories(SYSTEM ${X11_INCLUDE_DIR})
@@ -547,43 +549,7 @@ set_source_files_properties(third-party/nanors/rs.c
list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_TRAY=${SUNSHINE_TRAY})
-# Pre-compiled binaries
-if(WIN32)
@@ -26,7 +26,7 @@ index 1842c67..8afd0e9 100644
- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64")
- endif()
-else()
- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11)
set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11)
- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64")
- else()
@@ -52,10 +52,10 @@ index 1842c67..8afd0e9 100644
- ${FFMPEG_PREPARED_BINARIES}/lib/libx265.a
- ${HDR10_PLUS_LIBRARY}
- ${FFMPEG_PLATFORM_LIBRARIES})
-
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/third-party
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -593,7 +559,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/enet/include
${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors
${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors/deps/obl
@@ -63,11 +63,13 @@ index 1842c67..8afd0e9 100644
${PLATFORM_INCLUDE_DIRS}
)
@@ -529,6 +492,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
@@ -627,7 +592,9 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
${CMAKE_THREAD_LIBS_INIT}
enet
opus
+ cbs
${FFMPEG_LIBRARIES}
+ ${FFMPEG_PLATFORM_LIBRARIES}
${Boost_LIBRARIES}
${OPENSSL_LIBRARIES}
${CURL_LIBRARIES}
pkgs/servers/sunshine/package-lock.json
Generated
+3 -3
View File
@@ -20,9 +20,9 @@
}
},
"node_modules/@popperjs/core": {
"version": "2.11.7",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
"integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==",
"version": "2.11.8",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
"peer": true,
"funding": {
"type": "opencollective",
pkgs/tools/cd-dvd/iat/default.nix
+22
View File
@@ -0,0 +1,22 @@
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation (finalAttr: {
pname = "iat";
version = "0.1.7";
src = fetchurl {
url = "mirror://sourceforge/iat.berlios/iat-${finalAttr.version}.tar.gz";
hash = "sha256-sl1X/eKKArLYfNSf0UeLA5rb2DY1GHmmVP6hTCd2SyE=";
};
meta = with lib; {
description = "The Iso9660 Analyzer Tool is a tool for detecting the structure of many types of CD/DVD images. It can convert from IMG to ISO format.";
homepage = "https://www.berlios.de/software/iso9660-analyzer-tool/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hughobrien ];
platforms = platforms.linux;
};
})
pkgs/tools/misc/halp/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "halp";
version = "0.1.6";
version = "0.1.7";
src = fetchFromGitHub {
owner = "orhun";
repo = "halp";
rev = "v${version}";
hash = "sha256-VGfZwXB2MM8dfjc89LjHBalNFTvp6B6KI0lPOlkHDOQ=";
hash = "sha256-SeBponGeQWKjbiS4GL8YA7y92BqLL+ja6ZSKAI3CeRM=";
};
cargoHash = "sha256-beYDb8+UKPLkkzey95Da8Ft2NwH2JZZsBLNvoW8FJN4=";
cargoHash = "sha256-/mzbLsIc0PW5yx/m9eq3IWYM6i1MKvmOY+17/Bwjguk=";
patches = [
# patch tests to point to the correct target directory
pkgs/tools/misc/plantuml/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
version = "1.2023.8";
version = "1.2023.9";
pname = "plantuml";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-Di0YqVFfvPtwog33RIxhzcb8QSChIPrkXvMl5jrYS6c=";
sha256 = "sha256-/X3eKLl+nXkWIjMB3w9oKBMfEJvdIdrleaYQMFJoXK0=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/misc/steampipe/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "steampipe";
version = "0.20.5";
version = "0.20.6";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
sha256 = "sha256-hpI667LNXwLhA/MgnlfLc/jk88ec94faV8hLnlAJ6ew=";
sha256 = "sha256-tCuW3iiRb8ptYYz0NiIs5NjEEO+ajejfc7kZj6M31os=";
};
vendorHash = "sha256-FWLEuSdhXSQJMd4PiiPTFC8aXkIlQ9LhL6/Dq7LkPPc=";
vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA=";
proxyVendor = true;
patchPhase = ''
pkgs/tools/networking/grpc_cli/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
version = "1.55.1";
version = "1.56.0";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-3FaNGrvd+EuknOsShLSZKAHmZoa8eLBw+BHbNK59PGU=";
hash = "sha256-RDslZ1WS4zze58XSeYrd714GIJrS+AP5PeOgvXIFBlo=";
fetchSubmodules = true;
};
nativeBuildInputs = [ automake cmake autoconf ];
pkgs/tools/networking/ntopng/default.nix
+2 -1
View File
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
owner = "ntop";
repo = "ntopng";
rev = "refs/tags/${version}";
hash = "sha256-iGqrS0AneKYwGMEpbKy9if8bnaEu6aEV+QaH+JrF9xs=";
hash = "sha256-pIm0C1+4JLVDdXxSaQtd6ON8R2l6KG8ZXuDDuRd6dQI=";
fetchSubmodules = true;
};
preConfigure = ''
pkgs/tools/networking/tun2socks/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "tun2socks";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "xjasonlyu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uu0FBhckZ06eXEEuKwN3MopGMDbMjjcABYa/lgM48n4=";
sha256 = "sha256-qRjVZF15CjFohv9PQO0bLAjS8ip//S7yncXOn9oS2XM=";
};
vendorHash = "sha256-QIXgRoxmJaeYGx77EB53zIb94InlQbUSOXE+cUdBttI=";
vendorHash = "sha256-zeiOcn33PnyoseYb0wynkn7MfGp3rHEYBStY98C6aR8=";
ldflags = [
"-w" "-s" "-buildid="
pkgs/tools/security/doppler/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "doppler";
version = "3.60.1";
version = "3.61.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
sha256 = "sha256-WzR2oKBQ3GEEmOC0hhb6tcVR4GfapS0LzLCJosQo37k=";
sha256 = "sha256-qX8W9tI8oVQXKA+RfJ7Y69mS7yf2nEgfu1IRvhmM48Y=";
};
vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";
pkgs/tools/security/spire/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "spire";
version = "1.6.4";
version = "1.7.0";
outputs = [ "out" "agent" "server" ];
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "spiffe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-frnqxy4Z/pg4tpNEHkIY2V+bu4rtuo8h1TX44mEnbnc=";
sha256 = "sha256-aJ9T8OUsHNeWV05MWLet35V0YFyD7QoiExN6PTmHs3w=";
};
vendorHash = "sha256-LR8aY2n8wU4abP+mcSgI03+I6Y1vcQGsp41+YNmZo9A=";
vendorHash = "sha256-4KJysqByDVuK2OU/+sGtpXtSJe4YkVe4OhRyn9tkgsg=";
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
pkgs/tools/security/step-kms-plugin/default.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "step-kms-plugin";
version = "0.8.3";
version = "0.9.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = pname;
rev = "v${version}";
hash = "sha256-Twi2Kixx1lIesVwxUkvAlvq0w+P7bdpwTuxNwRsNYQ8=";
hash = "sha256-b8YYLsEmbr/XP04aB5u2DMPc0hpgaYYspyWzSGuYccQ=";
};
vendorHash = "sha256-GjhpdcdRpxQczpkohBXTodwDcW9THSDJ9uQDDQY0hv0=";
vendorHash = "sha256-Zv70C1JkOjOrncNuox8yh2LB31gVcXxr01l+o7HRXm0=";
proxyVendor = true;
pkgs/tools/system/erdtree/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "erdtree";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "solidiquis";
repo = pname;
rev = "v${version}";
hash = "sha256-vaxfW5LuXN/Q8cjJY2V0xTahEtZKYJf+8y2z9Df4WFs=";
hash = "sha256-fxGAvWECTQZXHIZRiMY9NGBwzsKdjbIGrzYQfj+vzww=";
};
cargoHash = "sha256-BB25p9Zy3Z7oztt/AZRNc7mmrSYfVFyUr/t5t2azoYg=";
cargoHash = "sha256-zdSLiTmuOnomJe9hkV9qeud7SSjJZAI7SfW9acQaH+Q=";
meta = with lib; {
description = "File-tree visualizer and disk usage analyzer";
pkgs/tools/text/mdbook-pdf/default.nix
+3 -3
View File
@@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-pdf";
version = "0.1.6";
version = "0.1.7";
src = fetchCrate {
inherit pname version;
hash = "sha256-eaZ4LlswbVgC/pOZH3cevxGzlgKXFJnvcNMovqCEBOc=";
hash = "sha256-3hyvLLBcS7MLAL707tkvW8LGue/x9DudOYhJDDqAdRg=";
};
cargoHash = "sha256-mj1heP231CWad6Uy4g9TCcDVj8f86Pf689kuePbzfBg=";
cargoHash = "sha256-ecIaKSrkqUsQWchkm9uCTXLuQabzGmEz1UqDR13vX8Y=";
nativeBuildInputs = [
pkg-config
pkgs/tools/typesetting/tex/texlive/tl2nix.sed
+22 -24
View File
@@ -14,11 +14,11 @@ $a}
}
# form an attrmap per package
# ignore packages whose name contains "." (such as binaries)
:next-package
# ignore packages whose name contains "." (such as binaries) except for texlive.infra
/^name ([^.]+|texlive\.infra)$/,/^$/{
# quote package names, as some start with a number :-/
s/^name (.*)$/"\1" = {/p
# quote invalid names
s/^name ([0-9].*|texlive\.infra)$/"\1" = {/p
s/^name (.*)$/\1 = {/p
# extract revision
s/^revision ([0-9]*)$/ revision = \1;/p
@@ -37,33 +37,34 @@ $a}
s/^catalogue-version_(.*)/ version = "\1";/p
# extract deps
/^depend [^.]+$/{
s/^depend (.+)$/ deps = [\n "\1"/
/^depend ([^.]+|texlive\.infra)$/{
# open a list
i\ deps = [
# loop through following depend lines
:next
h ; N # save & read next line
s/\ndepend ([^.]+|texlive\.infra)$/\n "\1"/
s/\ndepend (.+)$//
t next # loop if the previous lines matched
:next-dep
s/^\n?depend ([^.]+|texlive\.infra)$/ "\1"/p # print dep
s/^.*$// # clear pattern space
N; /^\ndepend /b next-dep
x; s/$/\n ];/p ; x # print saved deps
s/^.*\n// # remove deps, resume processing
# close the list
i\ ];
D # restart cycle from the current line
}
# detect presence of notable files
/^runfiles /{
s/^runfiles .*$// # ignore the first line
s/^.*$// # ignore the first line
# read all files
:next-file
h ; N # save to hold space & read next line
s!\n (.+)$! \1! # save file name
t next-file # loop if the previous lines matched
N
s/\n / / # remove newline
t next-file # loop if previous line matched
x # work on saved lines in hold space
/ (RELOC|texmf-dist)\//i\ hasRunfiles = true;
/ tlpkg\//i\ hasTlpkg = true;
x # restore pattern space
s/^.*\n// # remove saved lines, resume processing
D # restart cycle from the current line
}
# extract postaction scripts (right now, at most one per package, so a string suffices)
@@ -75,8 +76,5 @@ $a}
/^execute\sAddFormat/i\ hasFormats = true;
# close attrmap
/^$/{
i};
b next-package
}
/^$/i};
}
pkgs/tools/typesetting/tex/texlive/tlpdb.nix
+4297 -4294
View File
File diff suppressed because it is too large Load Diff
pkgs/tools/typesetting/typst/Cargo.lock
Generated
+285 -17
View File
@@ -195,9 +195,9 @@ dependencies = [
[[package]]
name = "bumpalo"
version = "3.12.2"
version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b"
checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
@@ -338,6 +338,12 @@ dependencies = [
"roff",
]
[[package]]
name = "cobs"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
[[package]]
name = "codespan-reporting"
version = "0.11.1"
@@ -803,6 +809,118 @@ dependencies = [
"cc",
]
[[package]]
name = "icu_collections"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5"
dependencies = [
"displaydoc",
"serde",
"yoke",
"zerofrom",
"zerovec",
]
[[package]]
name = "icu_locid"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335"
dependencies = [
"displaydoc",
"litemap",
"tinystr",
"writeable",
"zerovec",
]
[[package]]
name = "icu_properties"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434"
dependencies = [
"displaydoc",
"icu_collections",
"icu_provider",
"serde",
"tinystr",
"zerovec",
]
[[package]]
name = "icu_provider"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305"
dependencies = [
"displaydoc",
"icu_locid",
"icu_provider_macros",
"postcard",
"serde",
"stable_deref_trait",
"writeable",
"yoke",
"zerofrom",
"zerovec",
]
[[package]]
name = "icu_provider_adapters"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3"
dependencies = [
"icu_locid",
"icu_provider",
"tinystr",
"yoke",
"zerovec",
]
[[package]]
name = "icu_provider_blob"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b"
dependencies = [
"icu_provider",
"postcard",
"serde",
"writeable",
"yoke",
"zerovec",
]
[[package]]
name = "icu_provider_macros"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "icu_segmenter"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3300a7b6bf187be98a57264ad094f11f2e062c2e8263132af010ff522ee5495"
dependencies = [
"displaydoc",
"icu_collections",
"icu_locid",
"icu_provider",
"num-traits",
"serde",
"utf8_iter",
"zerovec",
]
[[package]]
name = "idna"
version = "0.3.0"
@@ -1063,6 +1181,12 @@ dependencies = [
"libdeflate-sys",
]
[[package]]
name = "libm"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
[[package]]
name = "linked-hash-map"
version = "0.5.6"
@@ -1085,6 +1209,12 @@ dependencies = [
"rand_chacha",
]
[[package]]
name = "litemap"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94"
[[package]]
name = "lock_api"
version = "0.4.9"
@@ -1227,6 +1357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
"libm",
]
[[package]]
@@ -1397,6 +1528,16 @@ dependencies = [
"miniz_oxide",
]
[[package]]
name = "postcard"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00"
dependencies = [
"cobs",
"serde",
]
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -1911,6 +2052,18 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "synstructure"
version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"unicode-xid",
]
[[package]]
name = "syntect"
version = "5.0.0"
@@ -1996,6 +2149,33 @@ dependencies = [
"once_cell",
]
[[package]]
name = "time"
version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
dependencies = [
"itoa",
"serde",
"time-core",
"time-macros",
]
[[package]]
name = "time-core"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
dependencies = [
"time-core",
]
[[package]]
name = "tiny-skia"
version = "0.9.1"
@@ -2029,6 +2209,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef"
dependencies = [
"displaydoc",
"serde",
"zerovec",
]
[[package]]
@@ -2173,7 +2355,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
[[package]]
name = "typst"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"bitflags 2.3.1",
"bytemuck",
@@ -2198,6 +2380,7 @@ dependencies = [
"stacker",
"subsetter",
"svg2pdf",
"time",
"tiny-skia",
"tracing",
"ttf-parser",
@@ -2213,9 +2396,8 @@ dependencies = [
[[package]]
name = "typst-cli"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"atty",
"chrono",
"clap 4.2.7",
"clap_complete",
@@ -2243,7 +2425,7 @@ dependencies = [
[[package]]
name = "typst-docs"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"comemo",
"heck",
@@ -2262,7 +2444,7 @@ dependencies = [
[[package]]
name = "typst-library"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"az",
"chinese-number",
@@ -2271,6 +2453,11 @@ dependencies = [
"ecow",
"hayagriva",
"hypher",
"icu_properties",
"icu_provider",
"icu_provider_adapters",
"icu_provider_blob",
"icu_segmenter",
"kurbo",
"lipsum",
"log",
@@ -2281,6 +2468,7 @@ dependencies = [
"serde_yaml",
"smallvec",
"syntect",
"time",
"toml",
"tracing",
"ttf-parser",
@@ -2290,22 +2478,21 @@ dependencies = [
"unicode-math-class",
"unicode-script",
"unicode-segmentation",
"xi-unicode",
]
[[package]]
name = "typst-macros"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.16",
]
[[package]]
name = "typst-tests"
version = "0.4.0"
version = "0.5.0"
dependencies = [
"clap 4.2.7",
"comemo",
@@ -2418,6 +2605,12 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "unicode-xid"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unicode_names2"
version = "0.6.0"
@@ -2501,6 +2694,12 @@ dependencies = [
"svgtypes",
]
[[package]]
name = "utf8_iter"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33"
[[package]]
name = "utf8parse"
version = "0.2.1"
@@ -2785,6 +2984,12 @@ dependencies = [
"memchr",
]
[[package]]
name = "writeable"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f"
[[package]]
name = "wyz"
version = "0.5.1"
@@ -2794,12 +2999,6 @@ dependencies = [
"tap",
]
[[package]]
name = "xi-unicode"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
[[package]]
name = "xmlparser"
version = "0.13.5"
@@ -2837,6 +3036,75 @@ dependencies = [
"linked-hash-map",
]
[[package]]
name = "yoke"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de"
dependencies = [
"serde",
"stable_deref_trait",
"yoke-derive",
"zerofrom",
]
[[package]]
name = "yoke-derive"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af46c169923ed7516eef0aa32b56d2651b229f57458ebe46b49ddd6efef5b7a2"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"synstructure",
]
[[package]]
name = "zerofrom"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df54d76c3251de27615dfcce21e636c172dafb2549cd7fd93e21c66f6ca6bea2"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4eae7c1f7d4b8eafce526bc0771449ddc2f250881ae31c50d22c032b5a1c499"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"synstructure",
]
[[package]]
name = "zerovec"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea"
dependencies = [
"serde",
"yoke",
"zerofrom",
"zerovec-derive",
]
[[package]]
name = "zerovec-derive"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "486558732d5dde10d0f8cb2936507c1bb21bc539d924c949baf5f36a58e51bac"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"synstructure",
]
[[package]]
name = "zopfli"
version = "0.7.2"
pkgs/tools/typesetting/typst/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "typst";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "typst";
repo = "typst";
rev = "v${version}";
hash = "sha256-S8J2D87Zvyh501d8LG69in9om/nTS6Y+IDhJvjm/H0w=";
hash = "sha256-eBJ5JaYp+Lnz+DK5WuFg7fiN85ATRmmaxWeyOBFbYnU=";
};
cargoLock = {
pkgs/top-level/all-packages.nix
+4
View File
@@ -6299,6 +6299,8 @@ with pkgs;
cider = callPackage ../applications/audio/cider { };
iat = callPackage ../tools/cd-dvd/iat { };
isolyzer = callPackage ../tools/cd-dvd/isolyzer { };
isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { };
@@ -36303,6 +36305,8 @@ with pkgs;
antsimulator = callPackage ../games/antsimulator { };
atlauncher = callPackage ../games/atlauncher { };
augustus = callPackage ../games/augustus { };
ballerburg = callPackage ../games/ballerburg { } ;