mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
078fef0069
@ -200,7 +200,7 @@ luaposix = buildLuarocksPackage {
|
||||
The `buildLuarocksPackage` delegates most tasks to luarocks:
|
||||
|
||||
* it adds `luarocks` as an unpacker for `src.rock` files (zip files really).
|
||||
* configurePhase` writes a temporary luarocks configuration file which location
|
||||
* `configurePhase` writes a temporary luarocks configuration file which location
|
||||
is exported via the environment variable `LUAROCKS_CONFIG`.
|
||||
* the `buildPhase` does nothing.
|
||||
* `installPhase` calls `luarocks make --deps-mode=none --tree $out` to build and
|
||||
|
||||
@ -773,6 +773,24 @@
|
||||
due to upstream dropping support.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>mysql57</literal> has been removed. Please update to
|
||||
<literal>mysql80</literal> or <literal>mariadb</literal>. See
|
||||
the
|
||||
<link xlink:href="https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/">upgrade
|
||||
guide</link> for more information.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Consequently, <literal>cqrlog</literal> and
|
||||
<literal>amorok</literal> now use <literal>mariadb</literal>
|
||||
instead of <literal>mysql57</literal> for their embedded
|
||||
databases. Running <literal>mysql_upgrade</literal> may be
|
||||
neccesary.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>k3s</literal> supports <literal>clusterInit</literal>
|
||||
|
||||
@ -246,6 +246,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- `k3s` no longer supports docker as runtime due to upstream dropping support.
|
||||
|
||||
- `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information.
|
||||
|
||||
- Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary.
|
||||
- `k3s` supports `clusterInit` option, and it is enabled by default, for servers.
|
||||
|
||||
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
|
||||
|
||||
@ -214,7 +214,7 @@ in rec {
|
||||
${concatStrings (mapAttrsToList (name: unit:
|
||||
concatMapStrings (name2: ''
|
||||
ln -sfn '${name}' $out/'${name2}'
|
||||
'') unit.aliases) units)}
|
||||
'') (unit.aliases or [])) units)}
|
||||
|
||||
# Create .wants and .requires symlinks from the wantedBy and
|
||||
# requiredBy options.
|
||||
@ -222,13 +222,13 @@ in rec {
|
||||
concatMapStrings (name2: ''
|
||||
mkdir -p $out/'${name2}.wants'
|
||||
ln -sfn '../${name}' $out/'${name2}.wants'/
|
||||
'') unit.wantedBy) units)}
|
||||
'') (unit.wantedBy or [])) units)}
|
||||
|
||||
${concatStrings (mapAttrsToList (name: unit:
|
||||
concatMapStrings (name2: ''
|
||||
mkdir -p $out/'${name2}.requires'
|
||||
ln -sfn '../${name}' $out/'${name2}.requires'/
|
||||
'') unit.requiredBy) units)}
|
||||
'') (unit.requiredBy or [])) units)}
|
||||
|
||||
${optionalString (type == "system") ''
|
||||
# Stupid misc. symlinks.
|
||||
|
||||
@ -33,7 +33,8 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "brscan4-etc-files-0.4.3-3";
|
||||
pname = "brscan4-etc-files";
|
||||
version = "0.4.3-3";
|
||||
src = "${brscan4}/opt/brother/scanner/brscan4";
|
||||
|
||||
nativeBuildInputs = [ brscan4 ];
|
||||
|
||||
@ -197,7 +197,7 @@ in
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictRealtime = true;
|
||||
RestrictNamespaces = true;
|
||||
|
||||
@ -66,10 +66,7 @@ in {
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
SupplementaryGroups = [ "disk" ];
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged @resources"
|
||||
];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -137,7 +137,7 @@ in {
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
|
||||
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||
UMask = "0077";
|
||||
}
|
||||
];
|
||||
|
||||
@ -318,6 +318,17 @@ in
|
||||
description = "smokeping daemon user";
|
||||
home = smokepingHome;
|
||||
createHome = true;
|
||||
# When `cfg.webService` is enabled, `thttpd` makes SmokePing available
|
||||
# under `${cfg.host}:${cfg.port}/smokeping.fcgi` as per the `ln -s` below.
|
||||
# We also want that going to `${cfg.host}:${cfg.port}` without `smokeping.fcgi`
|
||||
# makes it easy for the user to find SmokePing.
|
||||
# However `thttpd` does not seem to support easy redirections from `/` to `smokeping.fcgi`
|
||||
# and only allows directory listings or `/` -> `index.html` resolution if the directory
|
||||
# has `chmod 755` (see https://acme.com/software/thttpd/thttpd_man.html#PERMISSIONS,
|
||||
# " directories should be 755 if you want to allow indexing").
|
||||
# Otherwise it shows `403 Forbidden` on `/`.
|
||||
# Thus, we need to make `smokepingHome` (which is given to `thttpd -d` below) `755`.
|
||||
homeMode = "755";
|
||||
};
|
||||
users.groups.${cfg.user} = {};
|
||||
systemd.services.smokeping = {
|
||||
|
||||
@ -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;
|
||||
};
|
||||
};
|
||||
|
||||
@ -86,7 +86,7 @@ in {
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@resources" "~@setuid"
|
||||
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
});
|
||||
mysqlPackages = {
|
||||
inherit (pkgs) mysql57 mysql80;
|
||||
inherit (pkgs) mysql80;
|
||||
};
|
||||
mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
|
||||
}
|
||||
|
||||
@ -28,6 +28,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
sm.wait_for_unit("thttpd")
|
||||
sm.wait_for_file("/var/lib/smokeping/data/Local/LocalMachine.rrd")
|
||||
sm.succeed("curl -s -f localhost:8081/smokeping.fcgi?target=Local")
|
||||
# Check that there's a helpful page without explicit path as well.
|
||||
sm.succeed("curl -s -f localhost:8081")
|
||||
sm.succeed("ls /var/lib/smokeping/cache/Local/LocalMachine_mini.png")
|
||||
sm.succeed("ls /var/lib/smokeping/cache/index.html")
|
||||
'';
|
||||
|
||||
@ -41,6 +41,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
systemd.targets.machines.wants = [ "systemd-nspawn@${containerName}.service" ];
|
||||
|
||||
virtualisation.additionalPaths = [ containerSystem ];
|
||||
|
||||
# not needed, but we want to test the nspawn file generation
|
||||
systemd.nspawn.${containerName} = { };
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
|
||||
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
|
||||
, fftw, phonon, plasma-framework, threadweaver, breeze-icons
|
||||
, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
|
||||
, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras
|
||||
, pmdk, numactl
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -23,7 +24,7 @@ mkDerivation rec {
|
||||
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
|
||||
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
|
||||
phonon plasma-framework threadweaver
|
||||
curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
|
||||
curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mariadb-embedded
|
||||
pcre snappy taglib taglib_extras breeze-icons
|
||||
];
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwig-studio";
|
||||
version = "4.4";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||
sha256 = "sha256-5xZTJc3NMhSnmrhls7EC+F5gPoHNmGih9Zwi5Hdg5V8=";
|
||||
sha256 = "sha256-+NvQ7TA8WLnZKbzsB+jLl/CIg7tayKd+W2svtXtDsT4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -23,20 +23,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shortwave";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Shortwave";
|
||||
rev = version;
|
||||
sha256 = "sha256-qwk63o9pfqpAm6l9ioj3RccacemQU8R6LF6El4yHkjQ";
|
||||
sha256 = "sha256-N0ftIq0+sxkpo56IGHZYAK6MgRNW7T6C2jWEiJsYy/Y=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-YrB322nv9CgZqt5//VMvVwjWA51ePlX2PI6raRJGBxA=";
|
||||
hash = "sha256-90JBN3cJKqIJX6DRq5FtEpIr5Isxf+jb1SlxGMbBwMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -37,11 +37,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "sha256-/ZESysxaDhMpyTKHjjoRMiLM7SMESA5VIfgWCqdyDck=";
|
||||
sha256 = "sha256-Q+K8oF1VEsuhmhPH6K3as1+71vCfaKCdzRzCIxtiXvE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
||||
@ -277,9 +277,10 @@ let
|
||||
rm -rf $out/share/emacs/site-lisp/elpa/*/server
|
||||
'';
|
||||
dontUseCmakeBuildDir = true;
|
||||
doCheck = true;
|
||||
doCheck = pkgs.stdenv.isLinux;
|
||||
packageRequires = [ self.emacs ];
|
||||
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm pkgs.llvmPackages.libclang ];
|
||||
buildInputs = [ pkgs.llvmPackages.libclang self.emacs ];
|
||||
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ];
|
||||
});
|
||||
|
||||
# tries to write a log file to $HOME
|
||||
|
||||
@ -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
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crow-translate";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
|
||||
hash = "sha256-ayEt4PI15NjlmFrDEa6Ipbn94nN9Ga7jThnIVBWPgKw=";
|
||||
hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
95
pkgs/applications/misc/meerk40t/default.nix
Normal file
95
pkgs/applications/misc/meerk40t/default.nix
Normal file
@ -0,0 +1,95 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi;
|
||||
|
||||
meerk40t-camera = buildPythonPackage rec {
|
||||
pname = "meerk40t-camera";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/meerk40t/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
opencv4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"camera"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MeerK40t camera plugin";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/meerk40t/meerk40t-camera";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
};
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "MeerK40t";
|
||||
version = "0.8.0031";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meerk40t";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7Vc7Z+mxy+xRbUBeivkqVwO86ovZDo42M4G0ZD23vMk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ezdxf
|
||||
meerk40t-camera
|
||||
opencv4
|
||||
pillow
|
||||
pyserial
|
||||
pyusb
|
||||
setuptools
|
||||
wxPython_4_2
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
|
||||
)
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}";
|
||||
description = "MeerK40t LaserCutter Software";
|
||||
homepage = "https://github.com/meerk40t/meerk40t";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@ -39,6 +39,7 @@
|
||||
, dbus
|
||||
, bash
|
||||
, coreutils
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
@ -129,6 +130,7 @@ in stdenv.mkDerivation rec {
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
zstd
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -30,7 +30,7 @@ in
|
||||
{
|
||||
pdfstudioviewer = callPackage ./common.nix rec {
|
||||
inherit desktopName pname program year;
|
||||
version = "${year}.0.2";
|
||||
version = "${year}.1.0";
|
||||
longDescription = ''
|
||||
PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
|
||||
'';
|
||||
@ -56,10 +56,10 @@ in
|
||||
|
||||
pdfstudio2022 = callPackage ./common.nix rec {
|
||||
inherit desktopName longDescription pname program year;
|
||||
version = "${year}.0.2";
|
||||
version = "${year}.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64_adoptium17.deb";
|
||||
sha256 = "sha256-fWZXCyizP++pkmC+UpgCzGvb0QrNs4RI6iC4ZBL8hLE=";
|
||||
url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
|
||||
sha256 = "sha256-OPmNhnkeSvHZZbh4SaMU/vDSLrDdTmMmuSGP2HyzVm4=";
|
||||
};
|
||||
extraBuildInputs = [
|
||||
libgccjit #for libstdc++.so.6 and libgomp.so.1
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rmapi";
|
||||
version = "0.0.21";
|
||||
version = "0.0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juruen";
|
||||
repo = "rmapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PObuO+Aea2MS1DW3/uOS7GajtFUPolDnPgwxYehGPlA=";
|
||||
sha256 = "sha256-tYGlI7p5KAskN+Y6vvBEm4+s9rKtL4TN43N/btN27UI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo=";
|
||||
|
||||
@ -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 ]}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@ -293,6 +293,10 @@ let
|
||||
rtc_use_pipewire = true;
|
||||
# Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
|
||||
chrome_pgo_phase = 0;
|
||||
} // optionalAttrs (chromiumVersionAtLeast "107") {
|
||||
clang_base_path = "${llvmPackages.clang}";
|
||||
use_qt = false;
|
||||
use_system_libwayland_server = true;
|
||||
} // optionalAttrs proprietaryCodecs {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
||||
@ -19,16 +19,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bAfND84mbJulv0IO6JF2c+ZbwKeND8AVAJHmdMmhZ/s=";
|
||||
sha256 = "sha256-ST5XVgij1h+4EWLlwdFmIYZ0RPSH5IoTw0YdP0a+Sa4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-S4p56/OZpufpi71aueYTvPcM4LoZWyAhcAzUUUrUw4Q=";
|
||||
vendorSha256 = "sha256-h6Ioy1wBOAOCGcqcLlPyqX5pyx22BIiHKx4ct0HmnyA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -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" ];
|
||||
|
||||
@ -33,6 +33,8 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/cmctl completion zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool for managing cert-manager service on Kubernetes clusters";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.35.0";
|
||||
sha256 = "11bbrxgfwvf6gnm402mcq6na75gcifx8m1b28pzspvw01p2yshf9";
|
||||
manifestsSha256 = "0ink2cvysgnqvid4hh2x969iqc86pmz654nd7wv37iqndfhy7rd5";
|
||||
version = "0.36.0";
|
||||
sha256 = "1rjsdisj2cib8pyfc1lx5jgx0dksh0zhiqccgvqvfja24azvhc4n";
|
||||
manifestsSha256 = "0kzbzn43i35kyl7h9kb4f21sbrz90jx9pj35002j2i1j20b2xzh8";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HCBEMMFMoepr4bUYICAGMb2A42smgd3VlE7b9TR6LAc=";
|
||||
vendorSha256 = "sha256-2N91+anR0nD9E563MgSQPwslR9J/uvSHLs6kD4Yc3So=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -48,13 +48,13 @@
|
||||
"version": "2.4.2"
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-k5WZpqZvoL4R1kQ0CBWK8JLkWCvfpkl1b849ZbJsPxw=",
|
||||
"hash": "sha256-CyubHE3YFGDt4T4dJ6ZHgvQ6V/nIHK/LODkl7Qm65Sk=",
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.188.0",
|
||||
"rev": "v1.189.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.188.0"
|
||||
"version": "1.189.0"
|
||||
},
|
||||
"ansible": {
|
||||
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
|
||||
@ -138,13 +138,13 @@
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"baiducloud": {
|
||||
"hash": "sha256-ivVgHJveSkfoV+Ctf9G7HbZScfKQ85kxdeBDfOptl6Q=",
|
||||
"hash": "sha256-9r9Y1iegVgaZk+2bKB0uHy6w0JotDuNUXemOqtJSAeg=",
|
||||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.15.11",
|
||||
"rev": "v1.16.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.15.11"
|
||||
"version": "1.16.0"
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
|
||||
@ -213,13 +213,13 @@
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"cloudamqp": {
|
||||
"hash": "sha256-RllW85iootELA7iz+UPD0s4KKP7gGRNHVwHd/CCUv0c=",
|
||||
"hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=",
|
||||
"owner": "cloudamqp",
|
||||
"provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.19.3",
|
||||
"vendorHash": "sha256-S8xlMpsHeJePYyydUpBSuOxW0APZw8qxcm+Ou9u1rWc=",
|
||||
"version": "1.19.3"
|
||||
"rev": "v1.20.0",
|
||||
"vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=",
|
||||
"version": "1.20.0"
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-uItV3BTB3bY8NrjD63oUWZMB0gEscEN4Y6aDTuDQW7c=",
|
||||
@ -286,13 +286,13 @@
|
||||
"version": "0.11.0"
|
||||
},
|
||||
"datadog": {
|
||||
"hash": "sha256-viQDfs3xOsGOsRmTB6LkdN1JPc95UYpQ6et2ud+Or94=",
|
||||
"hash": "sha256-GSm1SIWEPdQls3FXkRjvcxZDRjpNAoUQK1zUHvU4tZo=",
|
||||
"owner": "DataDog",
|
||||
"provider-source-address": "registry.terraform.io/DataDog/datadog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.16.0",
|
||||
"vendorHash": "sha256-U533VGe37ItG5EK+fJo8Nj8t1MhDAHdT03ghQLL3WzI=",
|
||||
"version": "3.16.0"
|
||||
"rev": "v3.17.0",
|
||||
"vendorHash": "sha256-xOXLwSKj48nY0ikh2+c8Ti1eNwnsizgAfWyhGE5ZAXE=",
|
||||
"version": "3.17.0"
|
||||
},
|
||||
"dhall": {
|
||||
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
|
||||
@ -423,13 +423,13 @@
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-dUL01cuP5fQdPPm6+R1XDQNups5BJC2oq8LSjJ1+tB0=",
|
||||
"hash": "sha256-sNm5/gj4QY7LvYpj5fUNcz/4gf+SiBaeu70VlWZC4aw=",
|
||||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v5.5.0",
|
||||
"rev": "v5.6.0",
|
||||
"vendorHash": null,
|
||||
"version": "5.5.0"
|
||||
"version": "5.6.0"
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
|
||||
@ -506,13 +506,13 @@
|
||||
"version": "2.7.1"
|
||||
},
|
||||
"heroku": {
|
||||
"hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=",
|
||||
"hash": "sha256-NabwjOTbBRlDNFBpCshxZMO9E958tfAIPPuyArvacFI=",
|
||||
"owner": "heroku",
|
||||
"provider-source-address": "registry.terraform.io/heroku/heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.1.5",
|
||||
"rev": "v5.1.6",
|
||||
"vendorHash": null,
|
||||
"version": "5.1.5"
|
||||
"version": "5.1.6"
|
||||
},
|
||||
"hetznerdns": {
|
||||
"hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=",
|
||||
@ -1129,13 +1129,13 @@
|
||||
"version": "1.78.5"
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=",
|
||||
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.37.0",
|
||||
"vendorHash": "sha256-Su5WpKF9zXeGKdaV8TxsTc6OGUYToNnXAbxWaNxS52U=",
|
||||
"version": "0.37.0"
|
||||
"rev": "v0.38.0",
|
||||
"vendorHash": "sha256-reXq1MyAhHRet1WwDJZafdOg1r7J4sktQ/QhQUPhDak=",
|
||||
"version": "0.38.0"
|
||||
},
|
||||
"thunder": {
|
||||
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filezilla";
|
||||
version = "3.60.2";
|
||||
version = "3.61.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
|
||||
hash = "sha256-5AfbrRaZU/+VFFK8vxONlTo6MCNfirsD0nHHEsx+V5I=";
|
||||
hash = "sha256-Cv7w5NolICaHsy7Wsf/NhELVs1vc0W308Cuy6pLimfc=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -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 = [
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fava";
|
||||
version = "1.22.3";
|
||||
version = "1.23";
|
||||
format = "pyproject";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-e8/VOn0WmrUO69x/4hKGtgKuj11U1Qv7OUhfOL/p5Ds=";
|
||||
sha256 = "sha256-dwJKSQiuggnseEbALSrT051Me/z1jpj/BjuxN0v5dpU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
|
||||
|
||||
@ -115,7 +115,6 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
inotifyrecursive
|
||||
joblib
|
||||
langdetect
|
||||
pkgs.libmysqlclient
|
||||
lxml
|
||||
msgpack
|
||||
numpy
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, libX11
|
||||
, pango
|
||||
, hamlib
|
||||
, mysql57
|
||||
, mariadb
|
||||
, tqsl
|
||||
, xdg-utils
|
||||
, xplanet
|
||||
@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
|
||||
--replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld"
|
||||
# Order is important
|
||||
substituteInPlace src/dData.pas \
|
||||
--replace "/usr/bin/mysqld_safe" "${mysql57}/bin/mysqld_safe" \
|
||||
--replace "/usr/bin/mysqld" "${mysql57}/bin/mysqld"
|
||||
--replace "/usr/bin/mysqld_safe" "${mariadb}/bin/mysqld_safe" \
|
||||
--replace "/usr/bin/mysqld" "${mariadb}/bin/mysqld"
|
||||
|
||||
# To be fail when I need to patch a new hardcoded binary
|
||||
! grep -C src -RC0 "/usr"
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
hamlib
|
||||
mysql57
|
||||
mariadb
|
||||
tqsl
|
||||
xdg-utils
|
||||
xplanet
|
||||
@ -87,8 +87,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
libmysqlclient=$(find "${mysql57}/lib" -name "libmysqlclient.so.*" | tail -n1)
|
||||
patchelf --add-needed "$libmysqlclient" "$out/bin/.cqrlog-wrapped"
|
||||
libmysqlclient=$(find "${mariadb.client}/lib" -name "libmysqlclient.so" | tail -n1)
|
||||
patchelf --add-needed "libmysqlclient.so" \
|
||||
--add-rpath "$(dirname "$libmysqlclient")" \
|
||||
"$out/bin/.cqrlog-wrapped"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.8";
|
||||
version = "1.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8=";
|
||||
sha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -112,6 +112,11 @@ stdenv.mkDerivation rec {
|
||||
revert = true;
|
||||
})
|
||||
./9pfs-use-GHashTable-for-fid-table.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-3165.patch";
|
||||
url = "https://gitlab.com/qemu-project/qemu/-/commit/d307040b18bfcb1393b910f1bae753d5c12a4dc7.patch";
|
||||
sha256 = "sha256-YPhm580lBNuAv7G1snYccKZ2V5ycdV8Ri8mTw5jjFBc=";
|
||||
})
|
||||
]
|
||||
++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "berry";
|
||||
version = "0.1.11";
|
||||
version = "0.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JLErvin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cs1NVwaANMIteCQuGqPcEWuUbfJulhjmfWnlU8Eb2OM=";
|
||||
hash = "sha256-xMJRiLNtwVRQf9HiCF3ClLKEmdDNxcY35IYxe+L7+Hk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, expat
|
||||
, flac
|
||||
, fontconfig
|
||||
, freetype
|
||||
, fribidi
|
||||
@ -26,25 +27,26 @@
|
||||
, libXpm
|
||||
, libXrandr
|
||||
, libjpeg
|
||||
, libogg
|
||||
, libpng
|
||||
, libpthreadstubs
|
||||
, libsndfile
|
||||
, libtiff
|
||||
, libxcb
|
||||
, mkfontdir
|
||||
, pcre
|
||||
, pcre2
|
||||
, perl
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "icewm";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ice-wm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "icewm";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-0mnhH/7Y4VXpNUU++ln2//9/vuTxq9sa2D933Cf7Ifw=";
|
||||
};
|
||||
|
||||
@ -56,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
flac
|
||||
fontconfig
|
||||
freetype
|
||||
fribidi
|
||||
@ -78,13 +81,14 @@ stdenv.mkDerivation rec {
|
||||
libXpm
|
||||
libXrandr
|
||||
libjpeg
|
||||
libogg
|
||||
libpng
|
||||
libpthreadstubs
|
||||
libsndfile
|
||||
libtiff
|
||||
libxcb
|
||||
mkfontdir
|
||||
pcre
|
||||
pcre2
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -94,7 +98,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# install legacy themes
|
||||
postInstall = ''
|
||||
cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/
|
||||
cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} \
|
||||
$out/share/icewm/themes/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -117,4 +122,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jwm";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joewing";
|
||||
repo = "jwm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rvuz2Pmon3XBqRMgDwZNrQlWDyLNSK30JPmmQTlN+Rs=";
|
||||
sha256 = "sha256-HPcNXf+frYbT8lr5vU5xpUnyjGpQ5rc2G14EjDwpk3c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
{ lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }:
|
||||
|
||||
{ pname ? args.name, version, nativeBuildInputs ? [],
|
||||
createFindlibDestdir ? true,
|
||||
dontStrip ? true,
|
||||
minimumSupportedOcamlVersion ? null,
|
||||
hasSharedObjects ? false,
|
||||
setupHook ? null,
|
||||
meta ? {}, ...
|
||||
}@args:
|
||||
let
|
||||
defaultMeta = {
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
};
|
||||
in
|
||||
assert minimumSupportedOcamlVersion != null ->
|
||||
lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
|
||||
|
||||
stdenv.mkDerivation (args // {
|
||||
name = "ocaml-${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ nativeBuildInputs;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
setupHook = if setupHook == null && hasSharedObjects
|
||||
then writeText "setupHook.sh" ''
|
||||
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${pname}/"
|
||||
''
|
||||
else setupHook;
|
||||
|
||||
inherit createFindlibDestdir;
|
||||
inherit dontStrip;
|
||||
|
||||
meta = defaultMeta // meta;
|
||||
})
|
||||
@ -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";
|
||||
|
||||
@ -6,28 +6,26 @@
|
||||
, flatpak
|
||||
, gettext
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
, libgee
|
||||
, libhandy
|
||||
, granite7
|
||||
, gtk4
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, libxml2
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sideload";
|
||||
version = "6.0.2";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9";
|
||||
sha256 = "sha256-iyqKhyBU9OLlPLy5ZD/GxoOzprbm7uKBkFzjUUoQc5g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,16 +36,14 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flatpak
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
libgee
|
||||
libhandy
|
||||
granite7
|
||||
gtk4
|
||||
libxml2
|
||||
];
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, python3
|
||||
, ninja
|
||||
, vala
|
||||
, gnome-settings-daemon
|
||||
, gtk3
|
||||
, granite
|
||||
, wingpanel
|
||||
@ -19,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-sound";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FHZ4YhGLqGTz5Po2XFJvnWuAi1eHKcT9zzgJFHic02E=";
|
||||
sha256 = "sha256-hifEd2uL1sBLF8H8KwYoxCyVpGkv9f4SqD6WmB7xJ7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,6 +39,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome-settings-daemon # media-keys
|
||||
granite
|
||||
gtk3
|
||||
libcanberra-gtk3
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "sha256-yetHt8zrIEenb1Z5L3oUmgVGxWaYOu4Nk4pbJD6K3zA=";
|
||||
sha256 = "sha256-u8wxyFYlqKL+NsSh+rM634MA9XsR9aJUJ+OtQ61uAFo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
|
||||
|
||||
@ -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=";
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ lib, buildOcaml, fetchFromGitHub, camlp4 }:
|
||||
|
||||
buildOcaml rec {
|
||||
version = "112.35.00";
|
||||
pname = "herelib";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "herelib";
|
||||
rev = version;
|
||||
sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ camlp4 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/herelib";
|
||||
description = "Syntax extension for inserting the current location";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
{ lib, buildOcaml, fetchFromGitHub, camlp4 }:
|
||||
|
||||
buildOcaml rec {
|
||||
pname = "pipebang";
|
||||
version = "113.00.00";
|
||||
|
||||
minimumSupportedOcamlVersion = "4.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "pipebang";
|
||||
rev = version;
|
||||
sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
propagatedBuildInputs = [ camlp4 ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janestreet/pipebang";
|
||||
description = "Syntax extension to transform x |! f into f x";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ericbmerritt ];
|
||||
};
|
||||
}
|
||||
@ -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.
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chex";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FiZElESyOVu1VJxUDNiN6HVADiaubDrGdQHYp2CN8f4=";
|
||||
hash = "sha256-FYB0IhokM74HBY2wOJYE6xJrHxHHWhDSAZpWFs6HFu0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -39,6 +39,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# See https://github.com/deepmind/chex/issues/204.
|
||||
"test_uninspected_checks"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chex is a library of utilities for helping to write reliable JAX code.";
|
||||
homepage = "https://github.com/deepmind/chex";
|
||||
|
||||
@ -13,14 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dm-tree";
|
||||
# As of 2021-12-29, the latest stable version still builds with Bazel.
|
||||
version = "unstable-2021-12-20";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = "tree";
|
||||
rev = "b452e5c2743e7489b4ba7f16ecd51c516d7cd8e3";
|
||||
sha256 = "1r187xwpvnnj98lyasngcv3lbxz0ziihpl5dbnjbfbjr0kh6z0j9";
|
||||
rev = version;
|
||||
hash = "sha256-rg6dcGcbTGfK3h4WAyhwCjgM3o64Jj2SImxNsZXJHHM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,22 +1,49 @@
|
||||
{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pyparsing
|
||||
, typing-extensions
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.12";
|
||||
version = "0.18.1";
|
||||
pname = "ezdxf";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozman";
|
||||
repo = "ezdxf";
|
||||
rev = "v${version}";
|
||||
sha256 = "1flcq96ljk5wqrmgsb4acflqzkg7rhlaxz0j5jxky9za0mj1x6dq";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-x1p9dWrbDtDreXdBuzOA4Za+ZC40y4xdEU7MGb9uUec=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkPhase = "pytest tests integration_tests";
|
||||
propagatedBuildInputs = [
|
||||
pyparsing
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyparsing ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires geomdl dependency
|
||||
"TestNurbsPythonCorrectness"
|
||||
"test_rational_spline_curve_points_by_nurbs_python"
|
||||
"test_rational_spline_derivatives_by_nurbs_python"
|
||||
"test_from_nurbs_python_curve_to_ezdxf_bspline"
|
||||
"test_from_ezdxf_bspline_to_nurbs_python_curve_non_rational"
|
||||
"test_from_ezdxf_bspline_to_nurbs_python_curve_rational"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ezdxf"
|
||||
"ezdxf.addons"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package to read and write DXF drawings (interface to the DXF file format)";
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.85.0";
|
||||
version = "0.85.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "tiangolo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mgrw5MQMqFcXExtsu/jW01dMlygfE1GzSqXHI6BG7j4=";
|
||||
hash = "sha256-pMKWaj81rDX+zPHGvHakMDWN8+SU2qBAStk7HqENaig=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-bugbear";
|
||||
version = "22.9.23";
|
||||
version = "22.10.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LI8NnAB87Iel5aTVb2BIwHUB6KVtHzLvu+pJnFI3nw0=";
|
||||
hash = "sha256-+eE9MY1k9JN0l3g8/wWOfbhkoSZLYG+wPKvl63R1n3o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user