Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
81a6c5a54c
@ -275,7 +275,7 @@ in
|
||||
Group = "freshrss";
|
||||
StateDirectory = "freshrss";
|
||||
WorkingDirectory = cfg.package;
|
||||
ExecStart = "./app/actualize_script.php";
|
||||
ExecStart = "${cfg.package}/app/actualize_script.php";
|
||||
} // systemd-hardening;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,34 +1,17 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.xserver.gdk-pixbuf;
|
||||
|
||||
# Get packages to generate the cache for. We always include gdk-pixbuf.
|
||||
effectivePackages = unique ([pkgs.gdk-pixbuf] ++ cfg.modulePackages);
|
||||
|
||||
# Generate the cache file by running gdk-pixbuf-query-loaders for each
|
||||
# package and concatenating the results.
|
||||
loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } ''
|
||||
(
|
||||
for package in ${concatStringsSep " " effectivePackages}; do
|
||||
module_dir="$package/${pkgs.gdk-pixbuf.moduleDir}"
|
||||
if [[ ! -d $module_dir ]]; then
|
||||
echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2
|
||||
continue
|
||||
fi
|
||||
GDK_PIXBUF_MODULEDIR="$module_dir" \
|
||||
${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders
|
||||
done
|
||||
) > "$out"
|
||||
'';
|
||||
loadersCache = pkgs.gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = lib.unique (cfg.modulePackages);
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.gdk-pixbuf.modulePackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
services.xserver.gdk-pixbuf.modulePackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
description = lib.mdDoc "Packages providing GDK-Pixbuf modules, for cache generation.";
|
||||
};
|
||||
@ -37,7 +20,7 @@ in
|
||||
# If there is any package configured in modulePackages, we generate the
|
||||
# loaders.cache based on that and set the environment variable
|
||||
# GDK_PIXBUF_MODULE_FILE to point to it.
|
||||
config = mkIf (cfg.modulePackages != []) {
|
||||
config = lib.mkIf (cfg.modulePackages != []) {
|
||||
environment.variables = {
|
||||
GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
|
||||
};
|
||||
|
||||
@ -74,6 +74,10 @@ let
|
||||
}) { inherit system; });
|
||||
|
||||
in with pkgs; {
|
||||
kafka_2_7 = makeKafkaTest "kafka_2_7" apacheKafka_2_7;
|
||||
kafka_2_8 = makeKafkaTest "kafka_2_8" apacheKafka_2_8;
|
||||
kafka_3_0 = makeKafkaTest "kafka_3_0" apacheKafka_3_0;
|
||||
kafka_3_1 = makeKafkaTest "kafka_3_1" apacheKafka_3_1;
|
||||
kafka_3_2 = makeKafkaTest "kafka_3_2" apacheKafka_3_2;
|
||||
kafka_3_3 = makeKafkaTest "kafka_3_3" apacheKafka_3_3;
|
||||
kafka = makeKafkaTest "kafka" apacheKafka;
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ mkDerivation rec {
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}"
|
||||
# There are some issues with using the wayland backend, see:
|
||||
# https://musescore.org/en/node/321936
|
||||
"--set QT_QPA_PLATFORM xcb"
|
||||
"--set-default QT_QPA_PLATFORM xcb"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -4,13 +4,13 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "thonny";
|
||||
version = "3.3.14";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13l8blq7y6p7a235x2lfiqml1bd4ba2brm3vfvs8wasjh3fvm9g5";
|
||||
sha256 = "sha256-VGP9JVw92rk1yXZDqTKcMzJt8t+T8YAg8zYxFaWxGr4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
buildDotnetModule rec {
|
||||
pname = "archisteamfarm";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "5.2.8.3";
|
||||
version = "5.3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "justarchinet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WoEbcZbTUH34xkJ+KtAbJXFqWSpFXlXtsQgXOVknxTg=";
|
||||
sha256 = "sha256-plimvkMUjQWQ0Ewm1TXL5IB1xe62DFhwBlBc4UeCguU=";
|
||||
};
|
||||
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
|
||||
|
||||
16
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
16
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
@ -57,11 +57,11 @@
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; })
|
||||
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; })
|
||||
(fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
@ -73,15 +73,15 @@
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.3.2"; sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.3.2"; sha256 = "0bs38r5kdw1xpbjbi5l82xbhfnfbzr5xhg5520lk05pg914d1ln1"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.3.2"; sha256 = "089nmaxzvm5xcf20pm4iiavz2k6lwh69r51xlbqg0ry605mnl869"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; })
|
||||
@ -95,9 +95,9 @@
|
||||
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
|
||||
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
|
||||
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; })
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "5.0.4"; sha256 = "1p1am57q0fz684cc7snv9d9jvmcvg6ym03np26ngvgyrlh9ph68r"; })
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.4"; sha256 = "0cy8a82ijgfv9zdlw9jjr8467h9781jlk90r94bhr8lanmjv3k1k"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.4"; sha256 = "1y31n9b29aydyakhqmgv3yxyzx27ys549zlc3ij3vf67n8by0jj8"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
|
||||
(fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
|
||||
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
|
||||
|
||||
@ -15,15 +15,13 @@ if [[ "$new_version" == "$old_version" ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
asf_path=$(pwd)
|
||||
asf_path=$PWD
|
||||
cd ../../../..
|
||||
|
||||
nixpkgs_path=$(pwd)
|
||||
if [[ "${1:-}" != "--deps-only" ]]; then
|
||||
update-source-version ArchiSteamFarm "$new_version"
|
||||
fi
|
||||
|
||||
$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file"
|
||||
|
||||
cd "$asf_path"
|
||||
./web-ui/update.sh
|
||||
exec "$asf_path/web-ui/update.sh"
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
repo = "ASF-ui";
|
||||
# updated by the update script
|
||||
# this is always the commit that should be used with asf-ui from the latest asf version
|
||||
rev = "60a692f2e0d6b7c2bcd2cf363042d4647f246b4b";
|
||||
sha256 = "1g49zwghdfgzd5canrrw1c2r4780xyvcaz72p14w036h93fw01z2";
|
||||
rev = "855ca01e6ec94947404ce728c447baf805c9a655";
|
||||
sha256 = "1s16i7hrp61nbq8wgwa3mxcsjqh0kkw91jiikdqysxrk2dgbaz77";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,6 +2,7 @@
|
||||
#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl
|
||||
set -eoux pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
pushd ../../../../..
|
||||
version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r)
|
||||
popd
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, wlrctl
|
||||
, gtk3
|
||||
, xprintidle
|
||||
, xprop
|
||||
, wrapGAppsHook
|
||||
, babel
|
||||
, psutil
|
||||
@ -58,7 +59,7 @@ buildPythonApplication rec {
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--prefix PATH : ${lib.makeBinPath [ alsa-utils wlrctl xprintidle ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ alsa-utils wlrctl xprintidle xprop ]}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cmctl";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cert-manager";
|
||||
repo = "cert-manager";
|
||||
rev = "4486c01f726f17d2790a8a563ae6bc6e98465505";
|
||||
sha256 = "1rzm6dn88nc2c8kayg1y9r7gkmbx42s0ph93ji7z56gqqpbqjmk7";
|
||||
rev = "da3265115bfd8be5780801cc6105fa857ef71965";
|
||||
sha256 = "0s6nki61crx62v6ypmm0yjbyy71ygifffhkp5554jh4g9hvcfbmr";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-45+tZZAEHaLdTN1NQCueJVTx5x2IanwDl+Y9MELqdBE=";
|
||||
vendorSha256 = "sha256-WPFteR3t9qQiuBcCLqvp8GterqcD2SxJi59Wb7BvDT4=";
|
||||
|
||||
subPackages = [ "cmd/ctl" ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "senpai";
|
||||
version = "unstable-2022-07-25";
|
||||
version = "unstable-2022-10-19";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~taiite";
|
||||
repo = "senpai";
|
||||
rev = "f13aa044de9d7b8922a12e895f3ff3f86b60e939";
|
||||
sha256 = "sha256-siQoRgbJIVtBXqrxJzdVABnDgdHqW5FLSJpBrL0iVuU=";
|
||||
rev = "b3377c58ffb0bc07d222258ea578bdab723b2ec8";
|
||||
sha256 = "sha256-QPqnfGdQJh+XDXTcOCwx5KK85vEQuAv386a+qk68zDU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";
|
||||
vendorSha256 = "sha256-+cdGRk/96Xu4IgtmZ8GbqWiKAxxwpAnuAkAnKX0CbmU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/senpai"
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.46.0";
|
||||
version = "3.46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "vZe6IFzEW60SmXvuE0ii+R2LAtcUWD159PrheU2sG4A=";
|
||||
sha256 = "p5Jp7wnoqAuo8My8ZDMl0rsFc0158G8x8lAehWfLjb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -44,11 +44,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.46.0";
|
||||
version = "3.46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "4J6Sdrxrmr8NrTpOgT7qHQJfT2qvH6w7ew+IiVdCkT8=";
|
||||
sha256 = "GshFg+0sr4l7B06Z+TVCrRRG//Cs+rhtXmeeAzrgLIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.9.2";
|
||||
version = "22.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "sha256-9cHCFXVgg7fahbQsVUAxgznyMfx4O42D1qWverucpZ8=";
|
||||
hash = "sha256-cHUkMrfVrdQXKrmK2jcNT6CHw0+VEWc1tp1XGuI0XcQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
@ -20,8 +20,7 @@ mkDerivation rec {
|
||||
++ lib.optionals stdenv.isLinux [ qtwayland ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration.";
|
||||
longDescription = "QOwnNotes is a plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration.";
|
||||
description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration";
|
||||
homepage = "https://www.qownnotes.org/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opensmt";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usi-verification-and-security";
|
||||
repo = "opensmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hy+NCR0gbU06WnfIyKy6XTH94vd0CevwGbZ7KlXVvIQ=";
|
||||
sha256 = "sha256-BvENPCrQ9XWg4NgFIcOP04BysBGBmCRakA6NCFccKWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inav-configurator";
|
||||
version = "4.1.0";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iNavFlight/inav-configurator/releases/download/${version}/INAV-Configurator_linux64_${version}.tar.gz";
|
||||
sha256 = "sha256-+rPzytnAQcNGbISFBHb4JS9Nqy0C2i36k+EPBvq/mso=";
|
||||
sha256 = "sha256-ZvZxQICa5fnJBTx0aW/hqQCuhQW9MkcVa2sOjPYaPXM=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-slim";
|
||||
version = "1.38.0";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker-slim";
|
||||
repo = "docker-slim";
|
||||
rev = version;
|
||||
sha256 = "sha256-UDEM7KCTkx+9GTkC8LSkcf4u6SozI3yYrdDwAdjeiLg=";
|
||||
sha256 = "sha256-CN3mvXjI6c10yvXM2owWASngsU2PjgLhd1N55vxubw0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -204,7 +204,9 @@ stdenvNoCC.mkDerivation (args // {
|
||||
fi
|
||||
|
||||
# Since mktemp is used this will be empty if the script didnt succesfully complete
|
||||
! test -s "$depsFile" && rm -rf "$depsFile"
|
||||
if ! test -s "$depsFile"; then
|
||||
rm -rf "$depsFile"
|
||||
fi
|
||||
}
|
||||
|
||||
trap exitTrap EXIT INT TERM
|
||||
|
||||
@ -15,12 +15,12 @@ let
|
||||
"comfy-wide-fixed"
|
||||
"comfy-wide-duo"
|
||||
];
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~protesilaos";
|
||||
repo = "iosevka-comfy";
|
||||
rev = version;
|
||||
sha256 = "0psbz40hicv3v3x7yq26hy6nfbzml1kha24x6a88rfrncdp6bds7";
|
||||
sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p";
|
||||
};
|
||||
privateBuildPlan = src.outPath + "/private-build-plans.toml";
|
||||
overrideAttrs = (attrs: {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nordzy-icon-theme";
|
||||
version = "1.7";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvatip";
|
||||
repo = "Nordzy-icon";
|
||||
rev = version;
|
||||
sha256 = "sha256-pyWEHP7tqg7Cca38a7cGTCx/PCQ+OqG2koxQB6PSzkA=";
|
||||
sha256 = "sha256-hKWfUlZqDKFwy4/jnZ9hnAClR7tuAa8sVf5DKmRa/XY=";
|
||||
};
|
||||
|
||||
# In the post patch phase we should first make sure to patch shebangs.
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "CeXA+TYPP4Vt6qfA2zD12rAVEYDfQYOAfGzzYCmS9cw=";
|
||||
sha256 = "r6X8ZuL2kVU8x9UX2yNjz/LWLNG130VeX09xMxOdIfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-CGjPz7eMOiesW+YM2E0wuz08KMiFqY+qCeN/o6UyNOQ=";
|
||||
sha256 = "sha256-H3UaNb1YmteT9bFBNfKT5OxtSywwcz/sdgxofY8UMSY=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
, shared-mime-info
|
||||
, wrapGAppsHook
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, libexif
|
||||
, gobject-introspection
|
||||
, gi-docgen
|
||||
@ -29,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eog";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-pSovPrGju1ADijNikCvHlRY+GphnY+6C0gQk566EVG8=";
|
||||
sha256 = "sha256-/tef88oZusYvJxVcm91p7vh1hwuXHm3LCqOMCT0TGXE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -78,6 +79,17 @@ stdenv.mkDerivation rec {
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}}"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# Thumbnailers
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
, ninja
|
||||
, libkrb5
|
||||
, openldap
|
||||
, enableOAuth2 ? stdenv.isLinux
|
||||
, webkitgtk_4_1
|
||||
, webkitgtk_5_0
|
||||
, libaccounts-glib
|
||||
@ -46,17 +47,18 @@
|
||||
, libgweather
|
||||
, boost
|
||||
, protobuf
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.46.0";
|
||||
version = "3.46.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "5fooCVoYP3q1qSjjWoKDebSB3e+D7Ux7UaLjxK71zas=";
|
||||
sha256 = "xV5yz/QZC0LmPdbqvG3OSKGh95BAUx8a9tUcHvpKpus=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -90,7 +92,6 @@ stdenv.mkDerivation rec {
|
||||
gnome-online-accounts
|
||||
p11-kit
|
||||
libgweather
|
||||
libaccounts-glib
|
||||
icu
|
||||
sqlite
|
||||
libkrb5
|
||||
@ -101,11 +102,17 @@ stdenv.mkDerivation rec {
|
||||
libphonenumber
|
||||
boost
|
||||
protobuf
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libaccounts-glib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
] ++ lib.optionals withGtk3 [
|
||||
gtk3
|
||||
] ++ lib.optionals (withGtk3 && enableOAuth2) [
|
||||
webkitgtk_4_1
|
||||
] ++ lib.optionals withGtk4 [
|
||||
gtk4
|
||||
] ++ lib.optionals (withGtk4 && enableOAuth2) [
|
||||
webkitgtk_5_0
|
||||
];
|
||||
|
||||
@ -130,8 +137,21 @@ stdenv.mkDerivation rec {
|
||||
"-DENABLE_EXAMPLES=${lib.boolToString withGtk3}"
|
||||
"-DENABLE_CANBERRA=${lib.boolToString withGtk3}"
|
||||
"-DENABLE_GTK4=${lib.boolToString withGtk4}"
|
||||
"-DENABLE_OAUTH2_WEBKITGTK=${lib.boolToString (withGtk3 && enableOAuth2)}"
|
||||
"-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}"
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cmake/modules/SetupBuildFlags.cmake \
|
||||
--replace "-Wl,--no-undefined" ""
|
||||
substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \
|
||||
--replace "G_OS_WIN32" "__APPLE__"
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
ln -s $out/lib/${pname}/*.dylib $out/lib/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# In order for GNOME not to depend on OCaml through Coccinelle,
|
||||
# we materialize the SmPL patch into a unified diff-style patch.
|
||||
@ -175,6 +195,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wiki.gnome.org/Apps/Evolution";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -298,7 +298,7 @@ index e61160c..d17871a 100644
|
||||
G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
|
||||
G_UNLOCK (mi_user_headers);
|
||||
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
index 2ed68cf..5dad98f 100644
|
||||
index e5645e2..170a0be 100644
|
||||
--- a/src/camel/providers/imapx/camel-imapx-server.c
|
||||
+++ b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
@@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store)
|
||||
@ -442,7 +442,7 @@ index 8e4ee81..bb8f8f7 100644
|
||||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
|
||||
index 5a21872..a56d589 100644
|
||||
index 7783781..6fb22cb 100644
|
||||
--- a/src/libedataserver/e-oauth2-service.c
|
||||
+++ b/src/libedataserver/e-oauth2-service.c
|
||||
@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
, libpulseaudio
|
||||
, libpwquality
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, libsecret
|
||||
, libwacom
|
||||
, libxml2
|
||||
@ -63,11 +64,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-mIyTNZLL3E5/DbqakyYuYXtzniWSeqFuF3lgx1TjHEg=";
|
||||
sha256 = "sha256-6YvGt4Sv0E8pfbXo5sWZEOLNCQMycQd08m3I3omvT8c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -139,6 +140,17 @@ stdenv.mkDerivation rec {
|
||||
addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}}"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
|
||||
|
||||
@ -38,11 +38,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Ap7LgZM/QE+k9spVvuR7A++JDoRGK/FF9u4JR34aOVU=";
|
||||
sha256 = "gQTnBD75uY4rULKrOP2gX9BDf4xVVp+haDC3vle+DfY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-remote-desktop";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-NrWdIeyuRLllzZHmynwMAJ1gcOwxyEt3wERZXddSeAs=";
|
||||
hash = "sha256-vYR8PKdzYJlTNEYs1GnkWhJHnxHAxI6WUCjtXLgHpbI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
, modemmanager
|
||||
, networkmanager
|
||||
, gnome-desktop
|
||||
, geocode-glib
|
||||
, geocode-glib_2
|
||||
, docbook_xsl
|
||||
, wrapGAppsHook
|
||||
, python3
|
||||
@ -93,6 +93,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch";
|
||||
sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM=";
|
||||
})
|
||||
|
||||
# Use geocode-glib_2 dependency
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/03739474621e579e10b72577960ff94b4001e7ff.patch";
|
||||
sha256 = "W4uD4ChNPZSsmQfmfmmXFA2Sm1RDkV7MqG8DmT4qeCY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -126,7 +133,7 @@ stdenv.mkDerivation rec {
|
||||
libgweather
|
||||
nss
|
||||
polkit
|
||||
geocode-glib
|
||||
geocode-glib_2
|
||||
geoclue2
|
||||
systemd
|
||||
libgudev
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
, shared-mime-info
|
||||
, libgweather
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, geoclue2
|
||||
, perl
|
||||
, docbook_xml_dtd_45
|
||||
@ -187,6 +188,17 @@ stdenv.mkDerivation rec {
|
||||
rm data/theme/gnome-shell.css
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}}"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# Until glib’s xdgmime is patched
|
||||
|
||||
@ -45,11 +45,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "8WUuquJ0pqhwlQAENRZGUgDMdVlNzM2bShWZsKxJ5o8=";
|
||||
sha256 = "wmdWie53vhHY/waq+kFsTK/EjTgRVTpz7PdkvWr/RHA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
@ -21,6 +22,7 @@
|
||||
, libexif
|
||||
, libseccomp
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, tracker
|
||||
, tracker-miners
|
||||
, gexiv2
|
||||
@ -47,6 +49,17 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Switch to GTK 4 settings schema to avoid crash when GTK 3 did not manage to contaminate environment.
|
||||
# https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1013
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/96d542a0d84da4ad6915a7727642490a5c433d4a.patch";
|
||||
sha256 = "BO/0ifRwSTDe7RV+DI3CPZg+UQezk0tbM+UidgoJRQM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/52b4daf4396fd3b21755b3a0d1fbf85c3831c6b1.patch";
|
||||
sha256 = "+8KCw2HZUi9UgOEUBNp4kbwqOI1qz6i0Q/wvzqTb8OA=";
|
||||
})
|
||||
|
||||
# Allow changing extension directory using environment variable.
|
||||
./extension_dir.patch
|
||||
|
||||
@ -106,6 +119,7 @@ stdenv.mkDerivation rec {
|
||||
# Thumbnailers
|
||||
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
|
||||
--prefix XDG_DATA_DIRS : "${librsvg}/share"
|
||||
--prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
@ -3,6 +3,10 @@
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
updateScript = callPackage ./update.nix { };
|
||||
|
||||
# Temporary helper until gdk-pixbuf supports multiple cache files.
|
||||
# This will go away, do not use outside Nixpkgs.
|
||||
_gdkPixbufCacheBuilder_DO_NOT_USE = callPackage ./gdk-pixbuf-cache-builder.nix { };
|
||||
|
||||
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
|
||||
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
|
||||
|
||||
|
||||
@ -3,85 +3,160 @@ import math
|
||||
import json
|
||||
import requests
|
||||
import sys
|
||||
from enum import Enum
|
||||
from libversion import Version
|
||||
from typing import Optional
|
||||
from typing import (
|
||||
Callable,
|
||||
Iterable,
|
||||
List,
|
||||
NamedTuple,
|
||||
Optional,
|
||||
Tuple,
|
||||
TypeVar,
|
||||
Type,
|
||||
cast,
|
||||
)
|
||||
|
||||
|
||||
def version_to_list(version):
|
||||
EnumValue = TypeVar("EnumValue", bound=Enum)
|
||||
|
||||
|
||||
def enum_to_arg(enum: Enum) -> str:
|
||||
return enum.name.lower().replace("_", "-")
|
||||
|
||||
|
||||
def arg_to_enum(enum_meta: Type[EnumValue], name: str) -> EnumValue:
|
||||
return enum_meta[name.upper().replace("-", "_")]
|
||||
|
||||
|
||||
def enum_to_arg_choices(enum_meta: Type[EnumValue]) -> Tuple[str, ...]:
|
||||
return tuple(enum_to_arg(v) for v in cast(Iterable[EnumValue], enum_meta))
|
||||
|
||||
|
||||
class Stability(Enum):
|
||||
STABLE = "stable"
|
||||
UNSTABLE = "unstable"
|
||||
|
||||
|
||||
VersionPolicy = Callable[[Version], bool]
|
||||
VersionPredicate = Callable[[Version, Stability], bool]
|
||||
|
||||
|
||||
class VersionPredicateHolder(NamedTuple):
|
||||
function: VersionPredicate
|
||||
|
||||
|
||||
def version_to_list(version: str) -> List[int]:
|
||||
return list(map(int, version.split(".")))
|
||||
|
||||
|
||||
def odd_unstable(version: Version, selected):
|
||||
def odd_unstable(version: Version, selected: Stability) -> bool:
|
||||
try:
|
||||
version = version_to_list(version.value)
|
||||
version_parts = version_to_list(version.value)
|
||||
except:
|
||||
# Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release.
|
||||
return selected != "stable"
|
||||
return selected != Stability.STABLE
|
||||
|
||||
if len(version) < 2:
|
||||
if len(version_parts) < 2:
|
||||
return True
|
||||
|
||||
even = version[1] % 2 == 0
|
||||
prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000)
|
||||
even = version_parts[1] % 2 == 0
|
||||
prerelease = (version_parts[1] >= 90 and version_parts[1] < 100) or (version_parts[1] >= 900 and version_parts[1] < 1000)
|
||||
stable = even and not prerelease
|
||||
if selected == "stable":
|
||||
if selected == Stability.STABLE:
|
||||
return stable
|
||||
else:
|
||||
return True
|
||||
|
||||
|
||||
def tagged(version: Version, selected):
|
||||
if selected == "stable":
|
||||
def tagged(version: Version, selected: Stability) -> bool:
|
||||
if selected == Stability.STABLE:
|
||||
return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value)
|
||||
else:
|
||||
return True
|
||||
|
||||
|
||||
def no_policy(version: Version, selected):
|
||||
def no_policy(version: Version, selected: Stability) -> bool:
|
||||
return True
|
||||
|
||||
|
||||
version_policies = {
|
||||
"odd-unstable": odd_unstable,
|
||||
"tagged": tagged,
|
||||
"none": no_policy,
|
||||
}
|
||||
class VersionPolicyKind(Enum):
|
||||
# HACK: Using function as values directly would make Enum
|
||||
# think they are methods and skip them.
|
||||
ODD_UNSTABLE = VersionPredicateHolder(odd_unstable)
|
||||
TAGGED = VersionPredicateHolder(tagged)
|
||||
NONE = VersionPredicateHolder(no_policy)
|
||||
|
||||
|
||||
def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]):
|
||||
def make_version_policy(
|
||||
version_policy_kind: VersionPolicyKind,
|
||||
selected: Stability,
|
||||
upper_bound: Optional[Version],
|
||||
) -> VersionPolicy:
|
||||
version_predicate = version_policy_kind.value.function
|
||||
if not upper_bound:
|
||||
return lambda version: version_predicate(version, selected)
|
||||
else:
|
||||
return lambda version: version_predicate(version, selected) and version < upper_bound
|
||||
|
||||
|
||||
parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.")
|
||||
parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.")
|
||||
parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged")
|
||||
parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable")
|
||||
parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).")
|
||||
def find_versions(package_name: str, version_policy: VersionPolicy) -> List[Version]:
|
||||
# The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762
|
||||
cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text)
|
||||
if type(cache) != list or cache[0] != 4:
|
||||
raise Exception("Unknown format of cache.json file.")
|
||||
|
||||
versions: Iterable[Version] = map(Version, cache[2][package_name])
|
||||
versions = sorted(filter(version_policy, versions))
|
||||
|
||||
return versions
|
||||
|
||||
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Find latest version for a GNOME package by crawling their release server.",
|
||||
)
|
||||
parser.add_argument(
|
||||
"package-name",
|
||||
help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.",
|
||||
)
|
||||
parser.add_argument(
|
||||
"version-policy",
|
||||
help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.",
|
||||
choices=enum_to_arg_choices(VersionPolicyKind),
|
||||
nargs="?",
|
||||
default=enum_to_arg(VersionPolicyKind.TAGGED),
|
||||
)
|
||||
parser.add_argument(
|
||||
"requested-release",
|
||||
help="Most of the time, we will want to update to stable version but sometimes it is useful to test.",
|
||||
choices=enum_to_arg_choices(Stability),
|
||||
nargs="?",
|
||||
default=enum_to_arg(Stability.STABLE),
|
||||
)
|
||||
parser.add_argument(
|
||||
"--upper-bound",
|
||||
dest="upper-bound",
|
||||
help="Only look for versions older than this one (useful for pinning dependencies).",
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
args = parser.parse_args()
|
||||
|
||||
package_name = getattr(args, "package-name")
|
||||
requested_release = getattr(args, "requested-release")
|
||||
requested_release = arg_to_enum(Stability, getattr(args, "requested-release"))
|
||||
upper_bound = getattr(args, "upper-bound")
|
||||
if upper_bound:
|
||||
if upper_bound is not None:
|
||||
upper_bound = Version(upper_bound)
|
||||
version_predicate = version_policies[getattr(args, "version-policy")]
|
||||
version_policy = make_version_policy(version_predicate, requested_release, upper_bound)
|
||||
version_policy_kind = arg_to_enum(VersionPolicyKind, getattr(args, "version-policy"))
|
||||
version_policy = make_version_policy(version_policy_kind, requested_release, upper_bound)
|
||||
|
||||
# The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762
|
||||
cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text)
|
||||
if type(cache) != list or cache[0] != 4:
|
||||
print("Unknown format of cache.json file.", file=sys.stderr)
|
||||
try:
|
||||
versions = find_versions(package_name, version_policy)
|
||||
except Exception as error:
|
||||
print(error, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
versions = map(Version, cache[2][package_name])
|
||||
versions = sorted(filter(version_policy, versions))
|
||||
|
||||
if len(versions) == 0:
|
||||
print("No versions matched.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
37
pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix
Normal file
37
pkgs/desktops/gnome/gdk-pixbuf-cache-builder.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{
|
||||
runCommand,
|
||||
pkg-config,
|
||||
gdk-pixbuf,
|
||||
lib,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
{
|
||||
extraLoaders,
|
||||
}:
|
||||
|
||||
let
|
||||
# Get packages to generate the cache for. We always include gdk-pixbuf.
|
||||
loaderPackages = [
|
||||
gdk-pixbuf
|
||||
] ++ extraLoaders;
|
||||
in
|
||||
|
||||
# Generate the cache file by running gdk-pixbuf-query-loaders for each
|
||||
# package and concatenating the results.
|
||||
runCommand "gdk-pixbuf-loaders.cache" {
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
(
|
||||
for package in ${lib.escapeShellArgs loaderPackages}; do
|
||||
module_dir="$package/${gdk-pixbuf.moduleDir}"
|
||||
if [[ ! -d "$module_dir" ]]; then
|
||||
echo "Error: gdkPixbufCacheBuilder: Passed package “''${package}” does not contain GdkPixbuf loaders in “${gdk-pixbuf.moduleDir}”." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
GDK_PIXBUF_MODULEDIR="$module_dir" \
|
||||
${stdenv.hostPlatform.emulator buildPackages} ${gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders
|
||||
done
|
||||
) > "$out"
|
||||
''
|
||||
@ -47,7 +47,7 @@ runCommand "gnome-gsettings-overrides" { preferLocalBuild = true; } ''
|
||||
${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages}
|
||||
|
||||
chmod -R a+w "$data_dir"
|
||||
cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF
|
||||
cat - > "$schema_dir/zz-nixos-defaults.gschema.override" <<- EOF
|
||||
${gsettingsOverrides}
|
||||
EOF
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, bash, pkgs, lib, writeScript, python3, common-updater-scripts }:
|
||||
{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }:
|
||||
{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }:
|
||||
|
||||
let
|
||||
@ -20,24 +20,62 @@ let
|
||||
else
|
||||
throw "“freeze” argument needs to be either a boolean, or a version string.";
|
||||
updateScript = writeScript "gnome-update-script" ''
|
||||
#!${bash}/bin/bash
|
||||
set -o errexit
|
||||
attr_path="$1"
|
||||
package_name="$2"
|
||||
package_version="$3"
|
||||
version_policy="$4"
|
||||
#!${python}/bin/python
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from libversion import Version
|
||||
|
||||
flvFlags=("$package_name" "$version_policy" "''${GNOME_UPDATE_STABILITY:-stable}")
|
||||
_, attr_path, package_name, package_version, version_policy, *remaining_args = sys.argv
|
||||
|
||||
if (( $# >= 5 )); then
|
||||
upper_bound="$5"
|
||||
flvFlags+=("--upper-bound=$upper_bound")
|
||||
fi
|
||||
flv_args = [
|
||||
package_name,
|
||||
version_policy,
|
||||
os.environ.get("GNOME_UPDATE_STABILITY", "stable"),
|
||||
]
|
||||
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts python ]}
|
||||
latest_tag=$(python "${./find-latest-version.py}" "''${flvFlags[@]}")
|
||||
update-source-version "$attr_path" "$latest_tag"
|
||||
echo '[ { "commitBody": "https://gitlab.gnome.org/GNOME/'$package_name'/-/compare/'$package_version'...'$latest_tag'" } ]'
|
||||
match remaining_args:
|
||||
case []:
|
||||
pass
|
||||
case [upper_bound]:
|
||||
flv_args.append(f"--upper-bound={upper_bound}")
|
||||
case other:
|
||||
print("gnome-update-script: Received too many arguments.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
latest_tag = subprocess.check_output(
|
||||
[
|
||||
"${python}/bin/python",
|
||||
"${./find-latest-version.py}",
|
||||
*flv_args,
|
||||
],
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
if Version(latest_tag) <= Version(package_version):
|
||||
# No newer updates found.
|
||||
print(json.dumps([]))
|
||||
sys.exit(0)
|
||||
|
||||
latest_tag = latest_tag.strip()
|
||||
subprocess.run(
|
||||
[
|
||||
"${common-updater-scripts}/bin/update-source-version",
|
||||
attr_path,
|
||||
latest_tag,
|
||||
],
|
||||
check=True,
|
||||
)
|
||||
|
||||
report = [
|
||||
{
|
||||
"attrPath": attr_path,
|
||||
"commitBody": f"https://gitlab.gnome.org/GNOME/{package_name}/-/compare/{package_version}...{latest_tag}",
|
||||
},
|
||||
]
|
||||
|
||||
print(json.dumps(report))
|
||||
'';
|
||||
in {
|
||||
name = "gnome-update-script";
|
||||
|
||||
@ -215,9 +215,9 @@ in {
|
||||
major = "3";
|
||||
minor = "11";
|
||||
patch = "0";
|
||||
suffix = "rc2";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "sha256-JbNcx9gsWtNNhnsXmhwWldEpvl7RSiHka2t/I1CotJA=";
|
||||
sha256 = "sha256-pX3ILXc1hhe6ZbmEHO4eO0QfOGw3id3AZ27KB38pUcM=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL_compat";
|
||||
version = "1.2.56";
|
||||
version = "1.2.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "sdl12-compat";
|
||||
rev = "release-" + version;
|
||||
hash = "sha256-qd+hdJygJ+D2Ult6kmhUJmoPjasOFnBziTI8QtNiclI=";
|
||||
hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amtk";
|
||||
version = "5.5.1";
|
||||
version = "5.5.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "7Ilt0BfiwUNoUuXmCXD80IML0SFI1XzBvcDZOCa925w=";
|
||||
sha256 = "x33S2PVex2tQItmW5RJ82S7GqhePo+jzP1fbukXfiIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cjose";
|
||||
version = "0.6.2";
|
||||
version = "0.6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmartzone";
|
||||
repo = "cjose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FHKuaf4Gg3On7d3UBbGD8k1gA8kGsCOaWtLMohr5woA=";
|
||||
sha256 = "sha256-QgSO4jFouowDJeUTT4kUEXD+ctQ7JiY/5DkiPyb+Z/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, ninja
|
||||
, libxslt
|
||||
, gtk3
|
||||
, enableBackend ? stdenv.isLinux
|
||||
, webkitgtk_4_1
|
||||
, json-glib
|
||||
, librest_1_0
|
||||
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.46.0";
|
||||
|
||||
outputs = [ "out" "man" "dev" "devdoc" ];
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ];
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
|
||||
src = fetchFromGitLab {
|
||||
@ -46,8 +47,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dfedora=false" # not useful in NixOS or for NixOS users.
|
||||
"-Dgtk_doc=true"
|
||||
"-Dman=true"
|
||||
"-Dgoabackend=${lib.boolToString enableBackend}"
|
||||
"-Dgtk_doc=${lib.boolToString enableBackend}"
|
||||
"-Dman=${lib.boolToString enableBackend}"
|
||||
"-Dmedia_server=true"
|
||||
];
|
||||
|
||||
@ -79,6 +81,7 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
libsecret
|
||||
libsoup_3
|
||||
] ++ lib.optionals enableBackend [
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
@ -94,7 +97,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts";
|
||||
description = "Single sign-on framework for GNOME";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
|
||||
@ -63,7 +63,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk4";
|
||||
version = "4.8.1";
|
||||
version = "4.8.2";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
|
||||
outputBin = "dev";
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
|
||||
sha256 = "XOjY3piiO9DI7KGmEJThwAm18AncvWC0XpkKjbG3Qv0=";
|
||||
sha256 = "hbehYLbgLq+k59OPBG+HIPq1N9P+c8AchkMzqYOmkqk=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
@ -179,7 +179,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
files=(
|
||||
build-aux/meson/post-install.py
|
||||
build-aux/meson/gen-demo-header.py
|
||||
demos/gtk-demo/geninclude.py
|
||||
gdk/broadway/gen-c-array.py
|
||||
@ -191,13 +190,6 @@ stdenv.mkDerivation rec {
|
||||
chmod +x ''${files[@]}
|
||||
patchShebangs ''${files[@]}
|
||||
|
||||
'' +
|
||||
# Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
|
||||
# it should be a build-time dep for build
|
||||
# TODO: send upstream
|
||||
''
|
||||
substituteInPlace meson.build \
|
||||
--replace "'gi-docgen', ver" "'gi-docgen', native:true, ver"
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, gettext
|
||||
, dbus
|
||||
, glib
|
||||
, udevSupport ? stdenv.isLinux
|
||||
, libgudev
|
||||
, udisks2
|
||||
, libgcrypt
|
||||
@ -72,26 +73,27 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libgudev
|
||||
udisks2
|
||||
libgcrypt
|
||||
dbus
|
||||
libgphoto2
|
||||
avahi
|
||||
libarchive
|
||||
libimobiledevice
|
||||
libbluray
|
||||
libnfs
|
||||
openssh
|
||||
gsettings-desktop-schemas
|
||||
libsoup_3
|
||||
] ++ lib.optionals udevSupport [
|
||||
libgudev
|
||||
udisks2
|
||||
fuse3
|
||||
libcdio
|
||||
samba
|
||||
libmtp
|
||||
libcap
|
||||
polkit
|
||||
libimobiledevice
|
||||
libbluray
|
||||
libcdio-paranoia
|
||||
libnfs
|
||||
openssh
|
||||
gsettings-desktop-schemas
|
||||
libsoup_3
|
||||
] ++ lib.optionals gnomeSupport [
|
||||
gcr
|
||||
glib-networking # TLS support
|
||||
@ -103,6 +105,17 @@ stdenv.mkDerivation rec {
|
||||
mesonFlags = [
|
||||
"-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
"-Dtmpfilesdir=no"
|
||||
] ++ lib.optionals (!udevSupport) [
|
||||
"-Dgudev=false"
|
||||
"-Dudisks2=false"
|
||||
"-Dfuse=false"
|
||||
"-Dcdda=false"
|
||||
"-Dsmb=false"
|
||||
"-Dmtp=false"
|
||||
"-Dadmin=false"
|
||||
"-Dgphoto2=false"
|
||||
"-Dlibusb=false"
|
||||
"-Dlogind=false"
|
||||
] ++ lib.optionals (!gnomeSupport) [
|
||||
"-Dgcr=false"
|
||||
"-Dgoa=false"
|
||||
@ -128,7 +141,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ] ++ teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libshumate";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "devdoc"; # demo app
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GNOME";
|
||||
repo = "libshumate";
|
||||
rev = version;
|
||||
sha256 = "fpHMfxnPnGJSfJe4kJ28+704QjjRwYddOZAB17QxXno=";
|
||||
sha256 = "zmPsWdTbM+T50X0BsVTn1Aw/5N6sL5hIQiRG5WSG1eg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,9 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, makeWrapper
|
||||
, gdk-pixbuf, libwebp
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, gdk-pixbuf
|
||||
, libwebp
|
||||
}:
|
||||
|
||||
let
|
||||
moduleDir = gdk-pixbuf.moduleDir;
|
||||
inherit (gdk-pixbuf) moduleDir;
|
||||
|
||||
# turning lib/gdk-pixbuf-#.#/#.#.#/loaders into lib/gdk-pixbuf-#.#/#.#.#/loaders.cache
|
||||
# removeSuffix is just in case moduleDir gets a trailing slash
|
||||
@ -15,36 +22,47 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aruiz";
|
||||
repo = pname;
|
||||
repo = "webp-pixbuf-loader";
|
||||
rev = version;
|
||||
sha256 = "sha256-dcdydWYrXZJjo4FxJtvzGzrQLOs87/BmxshFZwsT2ws=";
|
||||
};
|
||||
|
||||
# It looks for gdk-pixbuf-thumbnailer in this package's bin rather than the gdk-pixbuf bin. We need to patch that.
|
||||
postPatch = ''
|
||||
substituteInPlace webp-pixbuf.thumbnailer.in --replace @bindir@/gdk-pixbuf-thumbnailer $out/bin/webp-thumbnailer
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
gdk-pixbuf
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gdk-pixbuf meson ninja pkg-config makeWrapper ];
|
||||
buildInputs = [ gdk-pixbuf libwebp ];
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
libwebp
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgdk_pixbuf_query_loaders_path=${gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders"
|
||||
"-Dgdk_pixbuf_moduledir=${placeholder "out"}/${moduleDir}"
|
||||
];
|
||||
|
||||
# It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
|
||||
# So we replace it with a wrapped executable.
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer $out/bin/webp-thumbnailer \
|
||||
--set GDK_PIXBUF_MODULE_FILE $out/${loadersPath}
|
||||
postPatch = ''
|
||||
# It looks for gdk-pixbuf-thumbnailer in this package's bin rather than the gdk-pixbuf bin. We need to patch that.
|
||||
substituteInPlace webp-pixbuf.thumbnailer.in \
|
||||
--replace "@bindir@/gdk-pixbuf-thumbnailer" "$out/bin/webp-thumbnailer"
|
||||
'';
|
||||
|
||||
# environment variables controlling loaders.cache generation by gdk-pixbuf-query-loaders
|
||||
preInstall = ''
|
||||
export GDK_PIXBUF_MODULE_FILE=$out/${loadersPath}
|
||||
export GDK_PIXBUF_MODULEDIR=$out/${moduleDir}
|
||||
# environment variables controlling loaders.cache generation by gdk-pixbuf-query-loaders
|
||||
export GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}"
|
||||
export GDK_PIXBUF_MODULEDIR="$out/${moduleDir}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
|
||||
# So we replace it with a wrapped executable.
|
||||
mkdir -p "$out/bin"
|
||||
makeWrapper "${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer" "$out/bin/webp-thumbnailer" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -52,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/aruiz/webp-pixbuf-loader";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.cwyc ];
|
||||
maintainers = teams.gnome.members ++ [ maintainers.cwyc ];
|
||||
# meson.build:16:0: ERROR: Program or command 'gcc' not found or not executable
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
@ -14,15 +14,17 @@
|
||||
, xdg-desktop-portal
|
||||
, wayland
|
||||
, gnome
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-gnome";
|
||||
version = "43.0";
|
||||
version = "43.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "DhhnpFvKpd2yQKTP2yLdBVz4fwchC547twlJ88e+FqY=";
|
||||
sha256 = "Ca22bG2RU+bwXfZtqirWKl3g42Zl6dIpUXO7DdxTtM0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -47,6 +49,17 @@ stdenv.mkDerivation rec {
|
||||
"-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Pull in WebP support for gnome-backgrounds.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
}}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.128";
|
||||
version = "0.6.130";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/B7sb7uheMomdppnpCCzmDP8WpXFpjXYNwLByN5Jtrw=";
|
||||
sha256 = "sha256-sMtMLuf/tpCrMLImrDMvOyk7x3bK3K3flrfrvRnbLmw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";
|
||||
|
||||
@ -101,6 +101,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ansible/ansible-lint";
|
||||
description = "Best practices checker for Ansible";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sengaya SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ sengaya ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,12 +3,14 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, aiohttp
|
||||
, aiohttp-cors
|
||||
, click
|
||||
, colorama
|
||||
, hatch-fancy-pypi-readme
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, mypy-extensions
|
||||
, pathspec
|
||||
, parameterized
|
||||
@ -21,16 +23,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "black";
|
||||
version = "22.8.0";
|
||||
version = "22.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eS9+tUC6mhfoZWU4cB0+sa/LE047RbcfILJcd6jbfm4=";
|
||||
hash = "sha256-9RNYjaWZlD4M3k4yzJh56CXVhyDWVXBi0QmMWtgAgOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
nativeBuildInputs = [
|
||||
hatch-fancy-pypi-readme
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
# Necessary for the tests to pass on Darwin with sandbox enabled.
|
||||
# Black starts a local server and needs to bind a local address.
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geventhttpclient";
|
||||
version = "2.0.2";
|
||||
version = "2.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gTWoUgCxcN73KT0B3RVXkx/NG+wax4xSrXzt0iNoubo=";
|
||||
hash = "sha256-X3gsQZZD90vk0JGMDStjlW723ceiEn8Hy7gDOnWrNm8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam";
|
||||
version = "2.8.2";
|
||||
version = "2.9.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QrMYsuj9BremQGxociZRGIm/4aQRDHC7dRz6uo1PzOI=";
|
||||
sha256 = "sha256-/FPuPDJC+AuRNCtKv7pFrpsOlopPFEV/KggDWulRU8A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-cRa52rFZlSH0D5u9L7NcWbQGCNdOlRE2koRi8VgVpAo=";
|
||||
sha256 = "sha256-cD+Fzjtj2rqe6zCIBYmBiUGlZTkIvjM+Aw+/gE1bbRY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-db";
|
||||
version = "12.1.0";
|
||||
version = "12.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.db";
|
||||
inherit version;
|
||||
sha256 = "sha256-NekFa19t537lMlld8CX6iG4qstxIN4v11vTobdN8v3Y=";
|
||||
sha256 = "sha256-wAA/+oqFjUfbFYIxSWWC9jgFpgqvIg4AlKhVM3MwGuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pbr ];
|
||||
|
||||
@ -43,7 +43,7 @@ let
|
||||
sha256 = {
|
||||
x86_64-linux = "0x71b4kb8hlyacixipgfbgjgrbmhckxpbmrs2xk8iis7n5kg7539";
|
||||
aarch64-linux = "125lih7g2gj91k7j196wy5a5746wyfr8idj3ng369yh5wl7lfcfv";
|
||||
x86_64-darwin = "sha256-TzprR95KHYBu9SruI4BgwCaqI7KKe3HuzgCO1A5YFiM=";
|
||||
x86_64-darwin = "0z2kww4iby1izkwn6z2ai94y87bkjvwak8awdmjm8sgg00pa9l1a";
|
||||
aarch64-darwin = "0qajh4ac5lr1sznb2c471r5c5g2r0dk2pyqz8vhvnbk36r524h1h";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
@ -126,8 +126,8 @@ let
|
||||
--set FONTCONFIG_FILE ${fontconfig}
|
||||
'' + lib.optionalString withFirefox ''
|
||||
FIREFOX_REVISION=$(jq -r '.browsers[] | select(.name == "firefox").revision' $BROWSERS_JSON)
|
||||
mkdir -p $out/firefox-$FIREFOX_REVISION
|
||||
ln -s ${firefox}/bin/firefox $out/firefox-$FIREFOX_REVISION/firefox
|
||||
mkdir -p $out/firefox-$FIREFOX_REVISION/firefox
|
||||
ln -s ${firefox}/bin/firefox $out/firefox-$FIREFOX_REVISION/firefox/firefox
|
||||
'' + ''
|
||||
FFMPEG_REVISION=$(jq -r '.browsers[] | select(.name == "ffmpeg").revision' $BROWSERS_JSON)
|
||||
mkdir -p $out/ffmpeg-$FFMPEG_REVISION
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-eAydoWalAuhiZs06vU/D1JndxKBZZBsWqEFFbAvvfzA=";
|
||||
sha256 = "sha256-DwWX8ztqnm/KYkiarG9KXkHcVxYE6Cc285oOMz9gkqc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hawk authentication strategy for the requests python library.";
|
||||
homepage = "https://github.com/sam-washington/requests-hawk";
|
||||
homepage = "https://github.com/mozilla-services/requests-hawk";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ austinbutler ];
|
||||
};
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
let
|
||||
version = "0.15.3";
|
||||
srcSha256 = "sha256-HOOH3H2SXLcT2oW/xL80TO+ZSI+Haulnznpb4hlCQow=";
|
||||
yarnSha256 = "sha256-x9g0vSoexfknqLejgcNIigmkFnqYsmhcQNTOStcj68o=";
|
||||
version = "0.15.5";
|
||||
srcSha256 = "yaA2PKw4xuqd8vGXh/GhcJJHw4mJ1z97tWJTREE14ow=";
|
||||
yarnSha256 = "1jpb4gblmknl81f6iclqg8ba82ca931q38xpm0kzki8y5ayk9n67";
|
||||
in
|
||||
{
|
||||
inherit version yarnSha256;
|
||||
@ -31,6 +31,6 @@ in
|
||||
meta = with lib; {
|
||||
homepage = "https://woodpecker-ci.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ambroisie ];
|
||||
maintainers = with maintainers; [ ambroisie techknowlogick ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "1.6.40";
|
||||
version = "1.6.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = version;
|
||||
hash = "sha256-UATF7oR7EarfqFvJhwdyz7qMxpwkk9oabk2LB/w6Y3E=";
|
||||
hash = "sha256-4sj+zyFYtG/C6oDuQno/rkyxgdnnvAn9GZ5qvqA+UhA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw=";
|
||||
|
||||
125
pkgs/development/tools/godot/4/default.nix
Normal file
125
pkgs/development/tools/godot/4/default.nix
Normal file
@ -0,0 +1,125 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, autoPatchelfHook
|
||||
, pkg-config
|
||||
, scons
|
||||
, vulkan-loader
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXinerama
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libGLU
|
||||
, freetype
|
||||
, alsa-lib
|
||||
, libpulseaudio
|
||||
, dbus
|
||||
, speechd
|
||||
, fontconfig
|
||||
, udev
|
||||
, withPulseaudio ? false
|
||||
, withDbus ? true
|
||||
, withSpeechd ? false
|
||||
, withFontconfig ? true
|
||||
, withUdev ? true
|
||||
, withTouch ? true
|
||||
}:
|
||||
|
||||
let
|
||||
# Options from godot/platform/linuxbsd/detect.py
|
||||
options = {
|
||||
pulseaudio = withPulseaudio;
|
||||
dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
|
||||
speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
|
||||
fontconfig = withFontconfig; # Use fontconfig for system fonts support
|
||||
udev = withUdev; # Use udev for gamepad connection callbacks
|
||||
touch = withTouch; # Enable touch events
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "4.0-beta3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "01ae26d31befb6679ecd92cd3c73aa5a76162e95";
|
||||
sha256 = "sha256-Q+zMviGevezjcQKJPOm7zAu4liJ5z8Rl73TYmjRR3MY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoPatchelfHook
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
scons
|
||||
libGLU
|
||||
libX11
|
||||
libXcursor
|
||||
libXinerama
|
||||
libXi
|
||||
libXrandr
|
||||
libXext
|
||||
libXfixes
|
||||
]
|
||||
++ runtimeDependencies
|
||||
# Necessary to make godot see fontconfig.lib and dbus.lib
|
||||
++ lib.optional withFontconfig fontconfig
|
||||
++ lib.optional withDbus dbus;
|
||||
|
||||
runtimeDependencies = [
|
||||
vulkan-loader
|
||||
alsa-lib
|
||||
]
|
||||
++ lib.optional withPulseaudio libpulseaudio
|
||||
++ lib.optional withDbus dbus.lib
|
||||
++ lib.optional withSpeechd speechd
|
||||
++ lib.optional withFontconfig fontconfig.lib
|
||||
++ lib.optional withUdev udev;
|
||||
|
||||
patches = [
|
||||
# Godot expects to find xfixes inside xi, but nix's pkg-config only
|
||||
# gives the libs for the requested package (ignoring the propagated-build-inputs)
|
||||
./xfixes.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
sconsFlags = "platform=linuxbsd target=editor production=true";
|
||||
preConfigure = ''
|
||||
sconsFlags+=" ${
|
||||
lib.concatStringsSep " "
|
||||
(lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)
|
||||
}"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp bin/godot.* $out/bin/godot
|
||||
|
||||
installManPage misc/dist/linux/godot.6
|
||||
|
||||
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
|
||||
cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/"
|
||||
substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \
|
||||
--replace "Exec=godot" "Exec=$out/bin/godot"
|
||||
cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
|
||||
cp icon.png "$out/share/icons/godot.png"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://godotengine.org";
|
||||
description = "Free and Open Source 2D and 3D game engine";
|
||||
license = licenses.mit;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ twey shiryel ];
|
||||
};
|
||||
}
|
||||
12
pkgs/development/tools/godot/4/xfixes.patch
Normal file
12
pkgs/development/tools/godot/4/xfixes.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
|
||||
index ac69f3806b..14acbf5c58 100644
|
||||
--- a/platform/linuxbsd/detect.py
|
||||
+++ b/platform/linuxbsd/detect.py
|
||||
@@ -191,6 +191,7 @@ def configure(env: "Environment"):
|
||||
env.ParseConfig("pkg-config xrandr --cflags --libs")
|
||||
env.ParseConfig("pkg-config xrender --cflags --libs")
|
||||
env.ParseConfig("pkg-config xi --cflags --libs")
|
||||
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
|
||||
|
||||
if env["touch"]:
|
||||
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-lines";
|
||||
version = "0.4.18";
|
||||
version = "0.4.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-MQ+T/BwDXPm9xTsujAGrWnIuhJBbij2VaXiRYpNj6ZM=";
|
||||
sha256 = "sha256-W8y7HENOmCqlhgD5r0pT4fIzxKkW/yIpLgkx/3PzvZI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EeUXRcK/4Xl25Q30RnNNF/eAv4zCu6epwrAorfIu21k=";
|
||||
cargoSha256 = "sha256-TXwxFrEUVK8caw/MXa7vtb4SSjsYTZN2PAf/T4K7qL4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-update";
|
||||
version = "10.0.1";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TerrXrHw5sh4ayaJs0cdSkjR8u0TIVWOSfnbUfnXP4c=";
|
||||
sha256 = "sha256-bqDbMQXzOlNQBVufEwBeH9XOjS3gpacowzHVTwu8XhA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-gURGLXbixgrkEAAqbVM7Qdt1i7t9xtBHBJ4fjQq0fjw=";
|
||||
cargoSha256 = "sha256-oHp4olxnTeVXxhhWqWPBZXRfYZRtzuPfP3rENJAJQMo=";
|
||||
|
||||
nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ];
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
{ lib, fetchFromGitHub, buildPythonApplication, qt5
|
||||
, psutil, pypresence, pyqt5, python, qtawesome, requests }:
|
||||
, legendary-gl, pypresence, pyqt5, python, qtawesome, requests, typing-extensions }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rare";
|
||||
version = "1.8.9";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dummerle";
|
||||
repo = "Rare";
|
||||
rev = version;
|
||||
sha256 = "sha256-2l8Id+bA5Ugb8+3ioiZ78dUtDusU8cvZEAMhmYBcJFc=";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-mL23tq5Fvd/kXAr7PZ+le5lRXwV3rKG/s8GuXE+S11M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -18,19 +17,17 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
psutil
|
||||
legendary-gl
|
||||
pypresence
|
||||
pyqt5
|
||||
qtawesome
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
patches = [ ./fix-instance.patch ];
|
||||
|
||||
preBuild = ''
|
||||
# Solves "PermissionError: [Errno 13] Permission denied: '/homeless-shelter'"
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 misc/rare.desktop -t $out/share/applications/
|
||||
|
||||
10
pkgs/games/rare/fix-instance.patch
Normal file
10
pkgs/games/rare/fix-instance.patch
Normal file
@ -0,0 +1,10 @@
|
||||
diff --git a/rare/utils/misc.py b/rare/utils/misc.py
|
||||
index 4492074..5352dac 100644
|
||||
--- a/rare/utils/misc.py
|
||||
+++ b/rare/utils/misc.py
|
||||
@@ -190,6 +190,7 @@ def get_rare_executable() -> List[str]:
|
||||
executable = [sys.executable]
|
||||
|
||||
executable[0] = os.path.abspath(executable[0])
|
||||
+ executable.pop(0)
|
||||
return executable
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "autotiling";
|
||||
version = "1.6.1";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-BpBDafpMbK2Xcb+lGzcf5RivhwMCtoQ078EKO9AbE9U=";
|
||||
sha256 = "sha256-2zWuATgj92s3tPqvB4INPfucmJTWYmGBx12U10qXohw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ i3ipc importlib-metadata ];
|
||||
|
||||
@ -1,26 +1,40 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, libuuid
|
||||
, libnvme
|
||||
, json_c
|
||||
, zlib
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvme-cli";
|
||||
version = "1.16";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-nvme";
|
||||
repo = "nvme-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/wDQxsN1sji56zfcvqx02iciYnyxjIbL85bNaRwrHYw=";
|
||||
hash = "sha256-ZjgysgWMmBlN+aalI5u2vQ58XrtEbJlDPCqUN6avv08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libuuid ];
|
||||
mesonFlags = [
|
||||
"-Dversion-tag=${version}"
|
||||
];
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
|
||||
# To omit the hostnqn and hostid files that are impure and should be unique
|
||||
# for each target host:
|
||||
installTargets = [ "install-spec" ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3.pkgs.nose2
|
||||
];
|
||||
buildInputs = [
|
||||
libuuid
|
||||
libnvme
|
||||
json_c
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage; # https://nvmexpress.org/
|
||||
|
||||
@ -1,22 +1,39 @@
|
||||
{ lib, stdenv, fetchurl, jdk8_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
|
||||
{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
|
||||
majorVersion ? "1.0" }:
|
||||
|
||||
let
|
||||
jre8 = jdk8_headless;
|
||||
jre11 = jdk11_headless;
|
||||
versionMap = {
|
||||
"2.7" = {
|
||||
kafkaVersion = "2.7.1";
|
||||
"3.3" = {
|
||||
kafkaVersion = "3.3.1";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "1qv6blf99211bc80xnd4k42r9v9c5vilyqkplyhsa6hqymg32gfa";
|
||||
jre = jre11;
|
||||
sha256 = "sha256-GK2KNl+xEd4knTu4vzyWzRrwYOyPs+PR/Ep64Q2QQt4=";
|
||||
jre = jdk17_headless;
|
||||
};
|
||||
"3.2" = {
|
||||
kafkaVersion = "3.2.3";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-tvkbwBP83M1zl31J4g6uu4/LEhqJoIA9Eam48fyT24A=";
|
||||
jre = jdk17_headless;
|
||||
};
|
||||
"3.1" = {
|
||||
kafkaVersion = "3.1.2";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-SO1bTQkG3YQSv657QjwBeBCWbDlDqS3E5eUp7ciojnI=";
|
||||
jre = jdk17_headless;
|
||||
};
|
||||
"3.0" = {
|
||||
kafkaVersion = "3.0.2";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-G8b6STGlwow+iDqMCeZkF3HTKd94TKccmyfZ7AT/7yE=";
|
||||
jre = jdk17_headless;
|
||||
};
|
||||
"2.8" = {
|
||||
kafkaVersion = "2.8.2";
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ=";
|
||||
jre = jre11;
|
||||
jre = jdk11_headless;
|
||||
};
|
||||
|
||||
};
|
||||
in
|
||||
|
||||
@ -66,5 +83,5 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.ragge ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
passthru = { inherit jre; };
|
||||
passthru = { inherit jdk17_headless; };
|
||||
}
|
||||
|
||||
@ -11,16 +11,16 @@ let
|
||||
ncdns = fetchFromGitHub {
|
||||
owner = "namecoin";
|
||||
repo = "ncdns";
|
||||
rev = "2a486311b0fe1a921af34aa3b31e6e4e0569accc";
|
||||
sha256 = "01arwlycp1iia4bd3dgyn8dam1av2a7d9hv7f085n14l2i2aza7v";
|
||||
rev = "5adda8d4726d389597df432eb2e17eac1677cea2";
|
||||
sha256 = "sha256-Q/RrUTY4WfrByvQv1eCX29DQNf2vSIR29msmhgS73xk=";
|
||||
};
|
||||
|
||||
# script to patch the crypto/x509 package
|
||||
x509 = fetchFromGitHub {
|
||||
owner = "namecoin";
|
||||
repo = "x509-compressed";
|
||||
rev = "fb9f2b7bc9fcba954d70f63857cc0c3841b1cf47";
|
||||
sha256 = "1arkbpbzvhcmz5fhjqg34x2jbjnwmlisapk22rjki17qpamh7zks";
|
||||
rev = "2e30a62a69dac54a977410f283308df232a5d244";
|
||||
sha256 = "sha256-/Bd1gYjguj8AiKHyiaIKT+Y3R7kq5gLZlJhY9g/xFXk=";
|
||||
# ncdns must be put in a subdirectory for this to work.
|
||||
postFetch = ''
|
||||
cp -r --no-preserve=mode "${ncdns}" "$out/ncdns"
|
||||
@ -31,11 +31,11 @@ in
|
||||
|
||||
buildGoModule {
|
||||
pname = "ncdns";
|
||||
version = "unstable-2020-07-18";
|
||||
version = "unstable-2022-10-07";
|
||||
|
||||
src = x509;
|
||||
|
||||
vendorSha256 = "02bqf6vkj5msk35sr5sklnqqd16n7gns7knzqslw077xrxiz7bsg";
|
||||
vendorSha256 = "sha256-ENtTnDsz5WhRz1kiqnWQ5vyEpZtgi7ZeYvksffgW78k=";
|
||||
|
||||
# Override the go-modules fetcher derivation to apply
|
||||
# upstream's patch of the crypto/x509 library.
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant-cli";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "home-assistant-cli";
|
||||
rev = version;
|
||||
hash = "sha256-gtyW5FnpzUv/3TuBZ0LJXPxeQAkl7bf8M+K6RNATVm0=";
|
||||
hash = "sha256-4OeHJ7icDZUOC5K4L0F0Nd9lbJPgdW4LCU0wniLvJ1Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub, fetchurl, autoPatchelfHook }:
|
||||
{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub, fetchurl, autoPatchelfHook, matrix-sdk-crypto-nodejs }:
|
||||
|
||||
let
|
||||
ourNodePackages = import ./node-composition.nix {
|
||||
@ -23,9 +23,15 @@ ourNodePackages.package.override {
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
postRebuild = ''
|
||||
npm run build
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \
|
||||
--add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js"
|
||||
|
||||
cp -rv ${matrix-sdk-crypto-nodejs}/lib/node_modules/@matrix-org/matrix-sdk-crypto-nodejs $out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/
|
||||
'';
|
||||
|
||||
passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"
|
||||
|
||||
$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
|
||||
--nodejs-14 \
|
||||
--nodejs-18 \
|
||||
--node-env ../../../development/node-packages/node-env.nix \
|
||||
--development \
|
||||
--lock ./package-lock-temp.json \
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,16 +1,17 @@
|
||||
{
|
||||
"name": "matrix-appservice-irc",
|
||||
"version": "0.35.1",
|
||||
"version": "0.36.0",
|
||||
"description": "An IRC Bridge for Matrix",
|
||||
"main": "app.js",
|
||||
"bin": "./bin/matrix-appservice-irc",
|
||||
"engines": {
|
||||
"node": ">=14"
|
||||
"node": ">=16"
|
||||
},
|
||||
"scripts": {
|
||||
"prepare": "npm run build",
|
||||
"build": "tsc --project ./tsconfig.json",
|
||||
"test": "BLUEBIRD_DEBUG=1 jasmine --stop-on-failure=true",
|
||||
"test:e2e": "jest --config spec/e2e/jest.config.js --forceExit # Can be removed after https://github.com/matrix-org/matrix-appservice-bridge/pull/439 is merged",
|
||||
"lint": "eslint -c .eslintrc --max-warnings 0 'spec/**/*.js' 'src/**/*.ts'",
|
||||
"check": "npm test && npm run lint",
|
||||
"ci-test": "nyc --report text jasmine",
|
||||
@ -28,43 +29,45 @@
|
||||
"dependencies": {
|
||||
"@sentry/node": "^6.17.9",
|
||||
"bluebird": "^3.7.2",
|
||||
"diff": "^5.0.0",
|
||||
"cross-fetch": "^3.1.5",
|
||||
"diff": "^5.1.0",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"extend": "^3.0.2",
|
||||
"he": "^1.2.0",
|
||||
"logform": "^2.4.0",
|
||||
"matrix-appservice-bridge": "^4.0.2",
|
||||
"matrix-org-irc": "1.3.0",
|
||||
"matrix-bot-sdk": "0.5.19",
|
||||
"nopt": "^3.0.1",
|
||||
"logform": "^2.4.2",
|
||||
"matrix-appservice-bridge": "^6.0.0",
|
||||
"matrix-bot-sdk": "^0.6.2",
|
||||
"matrix-org-irc": "^1.5.0",
|
||||
"nopt": "^6.0.0",
|
||||
"p-queue": "^6.6.2",
|
||||
"pg": "^8.7.3",
|
||||
"pg": "^8.8.0",
|
||||
"quick-lru": "^5.1.1",
|
||||
"request": "^2.54.0",
|
||||
"sanitize-html": "^2.7.0",
|
||||
"winston": "^3.6.0",
|
||||
"winston-daily-rotate-file": "^4.6.1"
|
||||
"sanitize-html": "^2.7.2",
|
||||
"winston": "^3.8.2",
|
||||
"winston-daily-rotate-file": "^4.7.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tsconfig/node14": "^1.0.1",
|
||||
"@tsconfig/node14": "^1.0.3",
|
||||
"@types/bluebird": "^3.5.36",
|
||||
"@types/diff": "^5.0.2",
|
||||
"@types/express": "4.17.13",
|
||||
"@types/express-serve-static-core": "4.17.28",
|
||||
"@types/express": "4.17.14",
|
||||
"@types/express-serve-static-core": "4.17.31",
|
||||
"@types/extend": "^3.0.1",
|
||||
"@types/he": "^1.1.2",
|
||||
"@types/nedb": "^1.8.12",
|
||||
"@types/node": "^14",
|
||||
"@types/node": "^16",
|
||||
"@types/nopt": "^3.0.29",
|
||||
"@types/pg": "^8.6.4",
|
||||
"@types/pg": "^8.6.5",
|
||||
"@types/sanitize-html": "^2.6.2",
|
||||
"@typescript-eslint/eslint-plugin": "^5.12.0",
|
||||
"@typescript-eslint/parser": "^5.12.0",
|
||||
"eslint": "^8.9.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.38.0",
|
||||
"@typescript-eslint/parser": "^5.38.0",
|
||||
"eslint": "^8.24.0",
|
||||
"homerunner-client": "^0.0.6",
|
||||
"jasmine": "^3.99.0",
|
||||
"proxyquire": "^2.1.3",
|
||||
"jest": "^29.1.1",
|
||||
"nyc": "^15.1.0",
|
||||
"request-promise-native": "^1.0.9",
|
||||
"typescript": "^4.8.2"
|
||||
"proxyquire": "^2.1.3",
|
||||
"ts-jest": "^29.0.2",
|
||||
"typescript": "^4.8.3"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"url": "https://github.com/matrix-org/matrix-appservice-irc",
|
||||
"rev": "766d1ad7b29d9aa63f03091b1c7f5834087dc62b",
|
||||
"date": "2022-09-26T12:23:03+01:00",
|
||||
"path": "/nix/store/znwafvyiszhildblxq7iamc7s1fzbc4y-matrix-appservice-irc",
|
||||
"sha256": "134snlri05nrm49b2qlkgfa5qipkl480gxl2dlalr0wd410qipnb",
|
||||
"rev": "89e44e482a918476059f543d242118abf4d0fb3d",
|
||||
"date": "2022-10-25T09:47:56+01:00",
|
||||
"path": "/nix/store/y7x302d9lq4cbq7fczrqk6c9g54xywvr-matrix-appservice-irc",
|
||||
"sha256": "0xsm54z9z6b7c5x8i5si8ndq6vllx8yjxlmg018l5ywzv8wcpy7k",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
# var/www/onlyoffice/documentserver/server/DocService/docservice
|
||||
onlyoffice-documentserver = stdenv.mkDerivation rec {
|
||||
pname = "onlyoffice-documentserver";
|
||||
version = "7.2.0";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb";
|
||||
sha256 = "sha256-BaKLOOZUrTzmBlXqo6wWRAoxrTIjUqhTzgFPNVpbueM=";
|
||||
sha256 = "sha256-V9s7UVz2BcuEObcsT6X2FulBlkz1BX2JM/bs/7vyZvI=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, dataPath ? "/var/lib/snappymail" }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snappymail";
|
||||
version = "2.18.6";
|
||||
version = "2.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
|
||||
sha256 = "sha256-BoRumpU9HjkNDr113LvIGmpsLlRJtAmGhSBcUoGO8Vc=";
|
||||
sha256 = "sha256-nIv70cS+7euRvtarI6DeXNst8a0rLVClYQ7CJubQUBU=";
|
||||
};
|
||||
|
||||
sourceRoot = "snappymail";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wishlist";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "wishlist";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q2/F4/bPhPmwkbc7dulx4jubwdwiwVWMNBclO2qf8rU=";
|
||||
sha256 = "sha256-oaptZaXG7qFjTPeasM4NjOBfa9jsEzqg+kKTge1mXv4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gmLPMar3ICZ14uxahQPkruKUoZbnvYAdu5IfO2pNEXM=";
|
||||
vendorSha256 = "sha256-Ifn230KHFDQ1RaKAVnd8EBsBZdpJY4Dx/KO+o1cm50k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzip3";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "kspalaiologos";
|
||||
repo = "bzip3";
|
||||
rev = version;
|
||||
hash = "sha256-MtD1pAznoH3yqaMO5P8GVexZSWZJxqADwh1sYvecAew=";
|
||||
hash = "sha256-dRdsKB1wpcDcgGZwoVQTcvrORmN/NhqKGoPwD5p5BQk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
diff --git a/vendor/adb/client/usb_linux.cpp b/vendor/adb/client/usb_linux.cpp
|
||||
index 25a50bd..0d09c47 100644
|
||||
--- a/vendor/adb/client/usb_linux.cpp
|
||||
+++ b/vendor/adb/client/usb_linux.cpp
|
||||
@@ -59,8 +59,15 @@ using namespace std::literals;
|
||||
#define DBGX(x...)
|
||||
|
||||
struct usb_handle {
|
||||
+ usb_handle() : urb_in(0), urb_out(0) {
|
||||
+ this->urb_in = new usbdevfs_urb;
|
||||
+ this->urb_out = new usbdevfs_urb;
|
||||
+ }
|
||||
+
|
||||
~usb_handle() {
|
||||
if (fd != -1) unix_close(fd);
|
||||
+ delete urb_in;
|
||||
+ delete urb_out;
|
||||
}
|
||||
|
||||
std::string path;
|
||||
@@ -72,8 +79,8 @@ struct usb_handle {
|
||||
unsigned zero_mask;
|
||||
unsigned writeable = 1;
|
||||
|
||||
- usbdevfs_urb urb_in;
|
||||
- usbdevfs_urb urb_out;
|
||||
+ usbdevfs_urb *urb_in;
|
||||
+ usbdevfs_urb *urb_out;
|
||||
|
||||
bool urb_in_busy = false;
|
||||
bool urb_out_busy = false;
|
||||
@@ -304,7 +311,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
|
||||
std::unique_lock<std::mutex> lock(h->mutex);
|
||||
D("++ usb_bulk_write ++");
|
||||
|
||||
- usbdevfs_urb* urb = &h->urb_out;
|
||||
+ usbdevfs_urb* urb = h->urb_out;
|
||||
memset(urb, 0, sizeof(*urb));
|
||||
urb->type = USBDEVFS_URB_TYPE_BULK;
|
||||
urb->endpoint = h->ep_out;
|
||||
@@ -343,7 +350,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
|
||||
std::unique_lock<std::mutex> lock(h->mutex);
|
||||
D("++ usb_bulk_read ++");
|
||||
|
||||
- usbdevfs_urb* urb = &h->urb_in;
|
||||
+ usbdevfs_urb* urb = h->urb_in;
|
||||
memset(urb, 0, sizeof(*urb));
|
||||
urb->type = USBDEVFS_URB_TYPE_BULK;
|
||||
urb->endpoint = h->ep_in;
|
||||
@@ -388,7 +395,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
|
||||
}
|
||||
D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length);
|
||||
|
||||
- if (out == &h->urb_in) {
|
||||
+ if (out == h->urb_in) {
|
||||
D("[ reap urb - IN complete ]");
|
||||
h->urb_in_busy = false;
|
||||
if (urb->status != 0) {
|
||||
@@ -397,7 +404,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
|
||||
}
|
||||
return urb->actual_length;
|
||||
}
|
||||
- if (out == &h->urb_out) {
|
||||
+ if (out == h->urb_out) {
|
||||
D("[ reap urb - OUT compelete ]");
|
||||
h->urb_out_busy = false;
|
||||
h->cv.notify_all();
|
||||
@@ -501,10 +508,10 @@ void usb_kick(usb_handle* h) {
|
||||
** but this ensures that a reader blocked on REAPURB
|
||||
** will get unblocked
|
||||
*/
|
||||
- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in);
|
||||
- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out);
|
||||
- h->urb_in.status = -ENODEV;
|
||||
- h->urb_out.status = -ENODEV;
|
||||
+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in);
|
||||
+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out);
|
||||
+ h->urb_in->status = -ENODEV;
|
||||
+ h->urb_out->status = -ENODEV;
|
||||
h->urb_in_busy = false;
|
||||
h->urb_out_busy = false;
|
||||
h->cv.notify_all();
|
||||
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
||||
revert = true;
|
||||
excludes = [ "vendor/fmtlib" ];
|
||||
})
|
||||
./android-tools-kernel-headers-6.0.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake perl go ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "antimicrox";
|
||||
version = "3.2.5";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AntiMicroX";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Lc23VvIZguE6nRHeGDW3pL4exKtJtF8XmFkN2SxUL0g=";
|
||||
sha256 = "sha256-2dCLU+8HR052RfccomOKyyomqaqdPBeq5BxbYtDnlMA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];
|
||||
|
||||
@ -11,22 +11,17 @@
|
||||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "223";
|
||||
version = "224";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
sha256 = "sha256-9QyMTYqaxRnVonVedLDGOgeK9/j39//zkzta9ngcNro=";
|
||||
sha256 = "sha256-rbfXQJJjPZAtoYbrpJczR5Gft+SeGoo6xjZvgwI+l1g=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
patches = [
|
||||
./ignore_links.patch
|
||||
|
||||
# due to https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/953a599c2b903298b038b34abf515cea69f4fc19
|
||||
# the version detection of LLVM is broken and the comparison result is compared against
|
||||
# the expected result from LLVM 10 (rather than 7 which is our default).
|
||||
./fix-tests.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py
|
||||
index 8d201ab..05960aa 100644
|
||||
--- a/tests/comparators/test_rlib.py
|
||||
+++ b/tests/comparators/test_rlib.py
|
||||
@@ -81,9 +81,6 @@ def rlib_dis_expected_diff():
|
||||
if actual_ver >= "7.0":
|
||||
diff_file = "rlib_llvm_dis_expected_diff_7"
|
||||
|
||||
- if actual_ver >= "10.0":
|
||||
- diff_file = "rlib_llvm_dis_expected_diff_10"
|
||||
-
|
||||
return get_data(diff_file)
|
||||
|
||||
|
||||
diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff
|
||||
index 7e90e428..9628efa0 100644
|
||||
--- a/tests/data/pgp_signed_expected_diff
|
||||
+++ b/tests/data/pgp_signed_expected_diff
|
||||
@@ -5,11 +5,11 @@
|
||||
Key ID - 0x1E953E27D4311E58
|
||||
Next packet - other than one pass signature
|
||||
Old: Literal Data Packet(tag 11)(10255 bytes)
|
||||
- Format - binary
|
||||
+ Packet data format - binary
|
||||
- Filename - test1.tar
|
||||
-- File modified time - Tue Aug 25 11:47:35 UTC 2020
|
||||
+- Creation time - Tue Aug 25 11:47:35 UTC 2020
|
||||
+ Filename - test2.tar
|
||||
-+ File modified time - Tue Aug 25 11:47:38 UTC 2020
|
||||
++ Creation time - Tue Aug 25 11:47:38 UTC 2020
|
||||
Literal - ...
|
||||
Old: Signature Packet(tag 2)(563 bytes)
|
||||
Ver 4 - new
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "memtest86+";
|
||||
version = "6.00-beta2";
|
||||
version = "6.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "memtest86plus";
|
||||
repo = "memtest86plus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-U3++iJa0Zj3g2SZTJ0jom7raAu+LGqiOKZEputs/YfM=";
|
||||
hash = "sha256-m9oGLXTCaE5CgA4o8MGdjQTQSz/j8kC9BJ84RVcBZjs=";
|
||||
};
|
||||
|
||||
# Binaries are booted directly by BIOS/UEFI or bootloader
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.31.4";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eULdBwQNquk4jj1SjdMsAN7S7mBSZs7jVAwMyFvOlWk=";
|
||||
sha256 = "sha256-AZSchcWYg9G7lps6EgupPksXbvKzrs8wlse1jsbC8Rs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-bKOY1r5SxAI9D+9YkYhX2l+pm2kZ6GEU2cf5NFqhuSU=";
|
||||
cargoSha256 = "sha256-UZb5jVO5E4Yin5ua9QVsRzQGa35Onm4s/w7ys31+vX4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.8.10";
|
||||
version = "1.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hwroSuxn9zVjQBz8r2y93o42zzVkHWAZaEKKEVgSb5s=";
|
||||
hash = "sha256-IEfwAAUqEGtN4vww0pfW7iuIY/U3eqzC+MJsqtossCw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7269,13 +7269,15 @@ with pkgs;
|
||||
|
||||
gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
|
||||
|
||||
godot = callPackage ../development/tools/godot {};
|
||||
godot_4 = callPackage ../development/tools/godot/4 { };
|
||||
|
||||
godot-export-templates = callPackage ../development/tools/godot/export-templates.nix { };
|
||||
godot = callPackage ../development/tools/godot/3 { };
|
||||
|
||||
godot-headless = callPackage ../development/tools/godot/headless.nix { };
|
||||
godot-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { };
|
||||
|
||||
godot-server = callPackage ../development/tools/godot/server.nix { };
|
||||
godot-headless = callPackage ../development/tools/godot/3/headless.nix { };
|
||||
|
||||
godot-server = callPackage ../development/tools/godot/3/server.nix { };
|
||||
|
||||
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
|
||||
|
||||
@ -16099,9 +16101,12 @@ with pkgs;
|
||||
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
|
||||
ant = apacheAnt;
|
||||
|
||||
apacheKafka = apacheKafka_2_8;
|
||||
apacheKafka_2_7 = callPackage ../servers/apache-kafka { majorVersion = "2.7"; };
|
||||
apacheKafka = apacheKafka_3_3;
|
||||
apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; };
|
||||
apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; };
|
||||
apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; };
|
||||
apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; };
|
||||
apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; };
|
||||
|
||||
kt = callPackage ../tools/misc/kt {};
|
||||
|
||||
@ -34108,7 +34113,7 @@ with pkgs;
|
||||
|
||||
leela-zero = libsForQt5.callPackage ../games/leela-zero { };
|
||||
|
||||
legendary-gl = python38Packages.callPackage ../games/legendary-gl { };
|
||||
legendary-gl = python3Packages.callPackage ../games/legendary-gl { };
|
||||
|
||||
left4gore-bin = callPackage ../games/left4gore { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user