Merge master into staging-next
This commit is contained in:
github-actions[bot]
+2
-2
@@ -306,8 +306,8 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag
|
||||
/pkgs/applications/networking/cluster/terraform-providers @zowoq
|
||||
|
||||
# Forgejo
|
||||
nixos/modules/services/misc/forgejo.nix @bendlas @emilylange
|
||||
pkgs/applications/version-management/forgejo @bendlas @emilylange
|
||||
nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
|
||||
pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange
|
||||
|
||||
# Dotnet
|
||||
/pkgs/build-support/dotnet @IvarWithoutBones
|
||||
|
||||
@@ -14,16 +14,16 @@ on:
|
||||
# While `edited` is also triggered when the PR title/body is changed,
|
||||
# this PR action is fairly quick, and PR's don't get edited that often,
|
||||
# so it shouldn't be a problem
|
||||
# There is a feature request for adding a `base_changed` event:
|
||||
# https://github.com/orgs/community/discussions/35058
|
||||
types: [opened, synchronize, reopened, edited]
|
||||
|
||||
permissions: {}
|
||||
|
||||
# Create a check-by-name concurrency group based on the pull request number. if
|
||||
# an event triggers a run on the same PR while a previous run is still in
|
||||
# progress, the previous run will be canceled and the new one will start.
|
||||
concurrency:
|
||||
group: check-by-name-${{ github.event.pull_request.number }}
|
||||
cancel-in-progress: true
|
||||
# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit
|
||||
# trigger), and contributers would get notified on any canceled run.
|
||||
# There is a feature request for supressing notifications on concurrency-canceled runs:
|
||||
# https://github.com/orgs/community/discussions/13015
|
||||
|
||||
jobs:
|
||||
check:
|
||||
|
||||
@@ -117,7 +117,6 @@ For more detail about managing the `deps.nix` file, see [Generating and updating
|
||||
* `useDotnetFromEnv` will change the binary wrapper so that it uses the .NET from the environment. The runtime specified by `dotnet-runtime` is given as a fallback in case no .NET is installed in the user's environment. This is most useful for .NET global tools and LSP servers, which often extend the .NET CLI and their runtime should match the users' .NET runtime.
|
||||
* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build.
|
||||
* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore.
|
||||
* `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute.
|
||||
* `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. Note that if set, only tests from this project are executed.
|
||||
* `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks.
|
||||
* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`.
|
||||
|
||||
@@ -20714,6 +20714,12 @@
|
||||
githubId = 858790;
|
||||
name = "Tobias Mayer";
|
||||
};
|
||||
tobz619 = {
|
||||
email = "toloke@yahoo.co.uk";
|
||||
github = "tobz619";
|
||||
githubId = 93312805;
|
||||
name = "Tobi Oloke";
|
||||
};
|
||||
tochiaha = {
|
||||
email = "tochiahan@proton.me";
|
||||
github = "Tochiaha";
|
||||
|
||||
@@ -80,6 +80,11 @@ OK_MISSING_BY_PACKAGE = {
|
||||
"plasma-desktop": {
|
||||
"scim", # upstream is dead, not packaged in Nixpkgs
|
||||
},
|
||||
"poppler-qt6": {
|
||||
"gobject-introspection-1.0", # we don't actually want to build the GTK variant
|
||||
"gdk-pixbuf-2.0",
|
||||
"gtk+-3.0",
|
||||
},
|
||||
"powerdevil": {
|
||||
"DDCUtil", # cursed, intentionally disabled
|
||||
},
|
||||
@@ -87,6 +92,9 @@ OK_MISSING_BY_PACKAGE = {
|
||||
"Qt6Qml", # tests only
|
||||
"Qt6Quick",
|
||||
},
|
||||
"skladnik": {
|
||||
"POVRay", # too expensive to rerender all the assets
|
||||
},
|
||||
"syntax-highlighting": {
|
||||
"XercesC", # only used for extra validation at build time
|
||||
}
|
||||
|
||||
@@ -146,7 +146,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable).
|
||||
|
||||
- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable).
|
||||
- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as `programs.pantheon-tweaks`.
|
||||
|
||||
- [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support.
|
||||
|
||||
|
||||
@@ -53,7 +53,6 @@ class AbstractLogger(ABC):
|
||||
|
||||
|
||||
class JunitXMLLogger(AbstractLogger):
|
||||
|
||||
class TestCaseState:
|
||||
def __init__(self) -> None:
|
||||
self.stdout = ""
|
||||
@@ -227,7 +226,7 @@ class XMLLogger(AbstractLogger):
|
||||
def __init__(self, outfile: str) -> None:
|
||||
self.logfile_handle = codecs.open(outfile, "wb")
|
||||
self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")
|
||||
self.queue: "Queue[Dict[str, str]]" = Queue()
|
||||
self.queue: Queue[dict[str, str]] = Queue()
|
||||
|
||||
self._print_serial_logs = True
|
||||
|
||||
|
||||
@@ -249,7 +249,6 @@
|
||||
./programs/oblogout.nix
|
||||
./programs/oddjobd.nix
|
||||
./programs/openvpn3.nix
|
||||
./programs/pantheon-tweaks.nix
|
||||
./programs/partition-manager.nix
|
||||
./programs/plotinus.nix
|
||||
./programs/pqos-wrapper.nix
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
meta = {
|
||||
maintainers = lib.teams.pantheon.members;
|
||||
};
|
||||
|
||||
###### interface
|
||||
options = {
|
||||
programs.pantheon-tweaks.enable = lib.mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon";
|
||||
};
|
||||
|
||||
###### implementation
|
||||
config = lib.mkIf config.programs.pantheon-tweaks.enable {
|
||||
services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ];
|
||||
};
|
||||
}
|
||||
@@ -40,12 +40,16 @@ in
|
||||
(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
|
||||
(mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] ''
|
||||
pantheon-tweaks is no longer a switchboard plugin but an independent app,
|
||||
adding the package to environment.systemPackages is sufficient.
|
||||
'')
|
||||
(mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
|
||||
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
|
||||
(mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''
|
||||
The hidepid module was removed, since the underlying machinery
|
||||
is broken when using cgroups-v2.
|
||||
The hidepid module was removed, since the underlying machinery
|
||||
is broken when using cgroups-v2.
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "baget" "enable" ] "The baget module was removed due to the upstream package being unmaintained.")
|
||||
(mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed")
|
||||
|
||||
@@ -38,6 +38,7 @@ in {
|
||||
]);
|
||||
};
|
||||
|
||||
hardware.pulseaudio.enable = lib.mkDefault true;
|
||||
networking.networkmanager.enable = lib.mkDefault true;
|
||||
|
||||
systemd.packages = with pkgs.lomiri; [
|
||||
@@ -74,6 +75,8 @@ in {
|
||||
ayatana-indicator-messages
|
||||
ayatana-indicator-power
|
||||
ayatana-indicator-session
|
||||
] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
|
||||
ayatana-indicator-sound
|
||||
]) ++ (with pkgs.lomiri; [
|
||||
telephony-service
|
||||
] ++ lib.optionals config.networking.networkmanager.enable [
|
||||
|
||||
@@ -31,6 +31,7 @@ in {
|
||||
ayatana-indicator-messages
|
||||
ayatana-indicator-power
|
||||
ayatana-indicator-session
|
||||
ayatana-indicator-sound
|
||||
] ++ (with pkgs.lomiri; [
|
||||
lomiri-indicator-network
|
||||
telephony-service
|
||||
@@ -41,6 +42,8 @@ in {
|
||||
|
||||
services.accounts-daemon.enable = true; # messages
|
||||
|
||||
hardware.pulseaudio.enable = true; # sound
|
||||
|
||||
# Lomiri-ish setup for Lomiri indicators
|
||||
# TODO move into a Lomiri module, once the package set is far enough for the DE to start
|
||||
|
||||
|
||||
@@ -290,7 +290,7 @@ in {
|
||||
# There's a test app we could use that also displays their contents, but it's abit inconsistent.
|
||||
with subtest("ayatana indicators work"):
|
||||
mouse_click(735, 0) # the cog in the top-right, for the session indicator
|
||||
machine.wait_for_text(r"(Notifications|Battery|Time|Date|System)")
|
||||
machine.wait_for_text(r"(Notifications|Battery|Sound|Time|Date|System)")
|
||||
machine.screenshot("indicators_open")
|
||||
|
||||
# Indicator order within the menus *should* be fixed based on per-indicator order setting
|
||||
@@ -298,6 +298,7 @@ in {
|
||||
machine.send_key("left")
|
||||
machine.send_key("left")
|
||||
machine.send_key("left")
|
||||
machine.send_key("left")
|
||||
# Notifications are usually empty, nothing to check there
|
||||
|
||||
with subtest("lomiri indicator network works"):
|
||||
@@ -305,6 +306,11 @@ in {
|
||||
machine.wait_for_text(r"(Flight|Wi-Fi)")
|
||||
machine.screenshot("indicators_network")
|
||||
|
||||
with subtest("lomiri indicator sound works"):
|
||||
machine.send_key("right")
|
||||
machine.wait_for_text(r"(Silent|Volume)")
|
||||
machine.screenshot("indicators_sound")
|
||||
|
||||
with subtest("ayatana indicator power works"):
|
||||
machine.send_key("right")
|
||||
machine.wait_for_text(r"(Charge|Battery settings)")
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{ mkDerivation, fetchurl, lib
|
||||
{ stdenv, fetchurl, lib
|
||||
, extra-cmake-modules, kdoctools
|
||||
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
|
||||
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
|
||||
, fftw, phonon, plasma-framework, threadweaver, breeze-icons
|
||||
, fftw, phonon, plasma-framework, threadweaver, breeze-icons, wrapQtAppsHook
|
||||
, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amarok";
|
||||
version = "2.9.71";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a";
|
||||
url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-FKh2eDBfrXagodrKVVpndf+mQuXrvMzs2R9JcJOZLBw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
|
||||
@@ -35,4 +35,4 @@ mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8221,6 +8221,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/dcampos/nvim-snippy/";
|
||||
};
|
||||
|
||||
nvim-snippets = buildVimPlugin {
|
||||
pname = "nvim-snippets";
|
||||
version = "2024-02-07";
|
||||
src = fetchFromGitHub {
|
||||
owner = "garymjr";
|
||||
repo = "nvim-snippets";
|
||||
rev = "f394d17b9a83820714957a06c6ed8e12223f3034";
|
||||
sha256 = "10yfjdjygxlagvf6pvj6n86n0kzf7j72zf7sq9mvy42a9h68i3ip";
|
||||
};
|
||||
meta.homepage = "https://github.com/garymjr/nvim-snippets/";
|
||||
};
|
||||
|
||||
nvim-solarized-lua = buildVimPlugin {
|
||||
pname = "nvim-solarized-lua";
|
||||
version = "2024-03-04";
|
||||
|
||||
@@ -692,6 +692,7 @@ https://github.com/petertriho/nvim-scrollbar/,HEAD,
|
||||
https://github.com/dstein64/nvim-scrollview/,,
|
||||
https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,
|
||||
https://github.com/dcampos/nvim-snippy/,HEAD,
|
||||
https://github.com/garymjr/nvim-snippets/,,
|
||||
https://github.com/ishan9299/nvim-solarized-lua/,,
|
||||
https://github.com/lucidph3nx/nvim-sops/,HEAD,
|
||||
https://github.com/nvim-pack/nvim-spectre/,,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, iso8601
|
||||
, progressbar2
|
||||
, requests
|
||||
@@ -8,15 +8,16 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "twitch-chat-downloader";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
|
||||
# NOTE: Using maintained fork because upstream has stopped working, and it has
|
||||
# not been updated in a while.
|
||||
# https://github.com/PetterKraabol/Twitch-Chat-Downloader/issues/142
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "tdh-tcd";
|
||||
sha256 = "sha256-dvj0HoF/2n5aQGMOD8UYY4EZegQwThPy1XJFvXyRT4Q=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheDrHax";
|
||||
repo = "twitch-chat-downloader";
|
||||
rev = version;
|
||||
hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -34,6 +35,6 @@ buildPythonApplication rec {
|
||||
mainProgram = "tcd";
|
||||
homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ assistant ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HVkR5sG3CfTW56pTB15S+w4kwbv7he9Be6RKmpu+E4E=";
|
||||
hash = "sha256-v3Y85e0I5CCL4+cT4O/VhKRIHKiw088XbqjuwZr0CeM=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-c0fTUU5zXI0QDo/bAL4v6zjEp0rNvCpQFAGwpgDWDFY=";
|
||||
vendorHash = "sha256-+YRLIQWInGCV2ORuABvM4cCjiMznENmAmE2jF9Eql6w=";
|
||||
|
||||
# Set target as ./cmd per cli-local
|
||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||
|
||||
@@ -84,8 +84,6 @@
|
||||
, dotnet-sdk ? dotnetCorePackages.sdk_6_0
|
||||
# The dotnet runtime to use.
|
||||
, dotnet-runtime ? dotnetCorePackages.runtime_6_0
|
||||
# The dotnet SDK to run tests against. This can differentiate from the SDK compiled against.
|
||||
, dotnet-test-sdk ? dotnet-sdk
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
@@ -96,7 +94,7 @@ let
|
||||
else dotnet-sdk.meta.platforms;
|
||||
|
||||
inherit (callPackage ./hooks {
|
||||
inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType;
|
||||
inherit dotnet-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType;
|
||||
runtimeId =
|
||||
if runtimeId != null
|
||||
then runtimeId
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
, makeSetupHook
|
||||
, makeWrapper
|
||||
, dotnet-sdk
|
||||
, dotnet-test-sdk
|
||||
, disabledTests
|
||||
, nuget-source
|
||||
, dotnet-runtime
|
||||
@@ -22,10 +21,9 @@ let
|
||||
libraryPath = lib.makeLibraryPath runtimeDeps;
|
||||
in
|
||||
{
|
||||
dotnetConfigureHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
dotnetConfigureHook = makeSetupHook
|
||||
{
|
||||
name = "dotnet-configure-hook";
|
||||
propagatedBuildInputs = [ dotnet-sdk nuget-source ];
|
||||
substitutions = {
|
||||
nugetSource = nuget-source;
|
||||
dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker";
|
||||
@@ -38,45 +36,47 @@ in
|
||||
];
|
||||
inherit runtimeId;
|
||||
};
|
||||
} ./dotnet-configure-hook.sh) { };
|
||||
}
|
||||
./dotnet-configure-hook.sh;
|
||||
|
||||
dotnetBuildHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
dotnetBuildHook = makeSetupHook
|
||||
{
|
||||
name = "dotnet-build-hook";
|
||||
propagatedBuildInputs = [ dotnet-sdk ];
|
||||
substitutions = {
|
||||
inherit buildType runtimeId;
|
||||
};
|
||||
} ./dotnet-build-hook.sh) { };
|
||||
}
|
||||
./dotnet-build-hook.sh;
|
||||
|
||||
dotnetCheckHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
dotnetCheckHook = makeSetupHook
|
||||
{
|
||||
name = "dotnet-check-hook";
|
||||
propagatedBuildInputs = [ dotnet-test-sdk ];
|
||||
substitutions = {
|
||||
inherit buildType runtimeId libraryPath;
|
||||
disabledTests = lib.optionalString (disabledTests != [])
|
||||
(let
|
||||
escapedNames = lib.lists.map (n: lib.replaceStrings [","] ["%2C"] n) disabledTests;
|
||||
filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames;
|
||||
in
|
||||
"${lib.concatStringsSep "&" filters}");
|
||||
disabledTests = lib.optionalString (disabledTests != [ ])
|
||||
(
|
||||
let
|
||||
escapedNames = lib.lists.map (n: lib.replaceStrings [ "," ] [ "%2C" ] n) disabledTests;
|
||||
filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames;
|
||||
in
|
||||
"${lib.concatStringsSep "&" filters}"
|
||||
);
|
||||
};
|
||||
} ./dotnet-check-hook.sh) { };
|
||||
}
|
||||
./dotnet-check-hook.sh;
|
||||
|
||||
dotnetInstallHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
dotnetInstallHook = makeSetupHook
|
||||
{
|
||||
name = "dotnet-install-hook";
|
||||
propagatedBuildInputs = [ dotnet-sdk ];
|
||||
substitutions = {
|
||||
inherit buildType runtimeId;
|
||||
};
|
||||
} ./dotnet-install-hook.sh) { };
|
||||
}
|
||||
./dotnet-install-hook.sh;
|
||||
|
||||
dotnetFixupHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
dotnetFixupHook = makeSetupHook
|
||||
{
|
||||
name = "dotnet-fixup-hook";
|
||||
propagatedBuildInputs = [ dotnet-runtime ];
|
||||
substitutions = {
|
||||
dotnetRuntime = dotnet-runtime;
|
||||
runtimeDeps = libraryPath;
|
||||
@@ -85,5 +85,6 @@ in
|
||||
dirname = "${coreutils}/bin/dirname";
|
||||
realpath = "${coreutils}/bin/realpath";
|
||||
};
|
||||
} ./dotnet-fixup-hook.sh) { };
|
||||
}
|
||||
./dotnet-fixup-hook.sh;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ dotnetBuildHook() {
|
||||
runtimeIdFlags+=("--runtime @runtimeId@")
|
||||
fi
|
||||
|
||||
env dotnet build ${project-} \
|
||||
dotnet build ${project-} \
|
||||
-maxcpucount:$maxCpuFlag \
|
||||
-p:BuildInParallel=$parallelBuildFlag \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
|
||||
@@ -22,7 +22,7 @@ dotnetCheckHook() {
|
||||
runtimeIdFlags=("--runtime @runtimeId@")
|
||||
fi
|
||||
|
||||
env "LD_LIBRARY_PATH=@libraryPath@" \
|
||||
LD_LIBRARY_PATH="@libraryPath@" \
|
||||
dotnet test "$project" \
|
||||
-maxcpucount:$maxCpuFlag \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
|
||||
@@ -15,7 +15,7 @@ dotnetConfigureHook() {
|
||||
|
||||
dotnetRestore() {
|
||||
local -r project="${1-}"
|
||||
env dotnet restore ${project-} \
|
||||
dotnet restore ${project-} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--runtime "@runtimeId@" \
|
||||
@@ -43,7 +43,7 @@ EOF
|
||||
find -name paket.dependencies -exec sed -i 's+source .*+source @nugetSource@/lib+g' {} \;
|
||||
find -name paket.lock -exec sed -i 's+remote:.*+remote: @nugetSource@/lib+g' {} \;
|
||||
|
||||
env dotnet tool restore --add-source "@nugetSource@/lib"
|
||||
dotnet tool restore --add-source "@nugetSource@/lib"
|
||||
|
||||
(( "${#projectFile[@]}" == 0 )) && dotnetRestore
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ dotnetInstallHook() {
|
||||
runtimeIdFlags+=("--runtime @runtimeId@")
|
||||
fi
|
||||
|
||||
env dotnet publish ${project-} \
|
||||
dotnet publish ${project-} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--output "${installPath-$out/lib/$pname}" \
|
||||
@@ -40,7 +40,7 @@ dotnetInstallHook() {
|
||||
|
||||
dotnetPack() {
|
||||
local -r project="${1-}"
|
||||
env dotnet pack ${project-} \
|
||||
dotnet pack ${project-} \
|
||||
-p:ContinuousIntegrationBuild=true \
|
||||
-p:Deterministic=true \
|
||||
--output "$out/share" \
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{ lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
bc,
|
||||
makeWrapper,
|
||||
runCommand,
|
||||
amber-lang
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amber-lang";
|
||||
version = "0.3.1-alpha";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ph0enixKM";
|
||||
repo = "Amber";
|
||||
rev = version;
|
||||
hash = "sha256-VSlLPgoi+KPnUQJEb6m0VZQVs1zkxEnfqs3fAp8m1o4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NzcyX/1yeFcI80pNxx/OTkaI82qyQFJW8U0vPbqSU7g=";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
nativeCheckInputs = [ bc ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/compiler.rs \
|
||||
--replace-fail "/bin/bash" "bash"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [bc]}"
|
||||
'';
|
||||
|
||||
passthru.tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
|
||||
diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World')
|
||||
touch $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Programming language compiled to bash";
|
||||
homepage = "https://amber-lang.com";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "amber";
|
||||
maintainers = with maintainers; [ cafkafk uncenter ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, gitUpdater
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
, accountsservice
|
||||
, cmake
|
||||
, dbus
|
||||
, dbus-test-runner
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtest
|
||||
, intltool
|
||||
, libayatana-common
|
||||
, libgee
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, libqtdbusmock
|
||||
, libqtdbustest
|
||||
, libsForQt5
|
||||
, libxml2
|
||||
, lomiri
|
||||
, pkg-config
|
||||
, python3
|
||||
, systemd
|
||||
, vala
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ayatana-indicator-sound";
|
||||
version = "24.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyatanaIndicators";
|
||||
repo = "ayatana-indicator-sound";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-2B2CFUjDvBpZ8R4fnGDViS3pXO1L0kP1tnJCtqKeLaQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc
|
||||
substituteInPlace data/CMakeLists.txt \
|
||||
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
|
||||
--replace-fail 'DESTINATION "/etc' 'DESTINATION "''${CMAKE_INSTALL_FULL_SYSCONFDIR}'
|
||||
|
||||
# Build-time Vala codegen
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail '/usr/share/gir-1.0/AccountsService-1.0.gir' '${lib.getDev accountsservice}/share/gir-1.0/AccountsService-1.0.gir'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gobject-introspection
|
||||
intltool
|
||||
libpulseaudio # vala files(?)
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
accountsservice
|
||||
glib
|
||||
gobject-introspection
|
||||
libayatana-common
|
||||
libgee
|
||||
libnotify
|
||||
libpulseaudio
|
||||
libxml2
|
||||
systemd
|
||||
] ++ (with lomiri; [
|
||||
cmake-extras
|
||||
lomiri-api
|
||||
lomiri-schemas
|
||||
]);
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
(python3.withPackages (ps: with ps; [
|
||||
python-dbusmock
|
||||
]))
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dbus-test-runner
|
||||
gtest
|
||||
libsForQt5.qtbase
|
||||
libqtdbusmock
|
||||
libqtdbustest
|
||||
lomiri.gmenuharness
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "ENABLE_LOMIRI_FEATURES" true)
|
||||
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
|
||||
(lib.cmakeBool "GSETTINGS_COMPILE" true)
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
passthru = {
|
||||
ayatana-indicators = [ "ayatana-indicator-sound" ];
|
||||
tests.vm = nixosTests.ayatana-indicators;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ayatana Indicator for managing system sound";
|
||||
longDescription = ''
|
||||
Ayatana Indicator Sound that provides easy control of the PulseAudio
|
||||
sound daemon.
|
||||
'';
|
||||
homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-sound";
|
||||
changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-sound/blob/${finalAttrs.version}/ChangeLog";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.13.49";
|
||||
version = "2.13.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QQ2UzWGodQASHJVfnTIp/BUNkAPAV0q8UpTk7qBYgc0=";
|
||||
hash = "sha256-UeRB+vmnLr85oGwaiuyfe5pVCN1EmEQqyoU5tY2hst8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L6UnKbqS6aO8+XSPt5KaKGYr30y9RE+l4U3hapPHHvA=";
|
||||
|
||||
@@ -24,7 +24,7 @@ let
|
||||
pname = "forgejo-frontend";
|
||||
inherit (forgejo) src version;
|
||||
|
||||
npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw=";
|
||||
npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA=";
|
||||
|
||||
patches = [
|
||||
./package-json-npm-build-frontend.patch
|
||||
@@ -39,17 +39,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "7.0.2";
|
||||
version = "7.0.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "forgejo";
|
||||
repo = "forgejo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YY5dHXWMqlCIPfqsDtHZLHjEdYmrFnh4yc0hfTUESww=";
|
||||
hash = "sha256-P+HVZmfNA1ao+fQ253tK8A2DNGNPxvdyzCvByQJ0FGA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw=";
|
||||
vendorHash = "sha256-8qMpnGL5GXJuxOpxh9a1Bcxd7tVweUKwbun8UBxCfQA=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ lib, fetchFromGitLab, rustPlatform }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
{ lib, fetchFromSourcehut, rustPlatform }:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "majima";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gumball-overall";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~cucumber-zoom";
|
||||
repo = "majima";
|
||||
rev = version;
|
||||
hash = "sha256-S62DQfvZFg8C26YG+fIVJj5cJ6mz73JXSgdu5yoK0Yo=";
|
||||
rev = "0f32dceeaf09c082cf33ab31b40d3bfc45aaa6f8";
|
||||
hash = "sha256-P5E0Wiy3mNPRCQ/bsIW4fG7LnPSPRXmW7pnbgl0/lBQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zMQO6McnnGbp52A9n/h6yZTU9VH7vak2TSP0HLqDlKw=";
|
||||
cargoHash = "sha256-sblSlmXkiJkVGbrMU6HgtvYnAd48SlUOgDwB6ASMFsQ=";
|
||||
|
||||
meta = {
|
||||
description = "Generate random usernames quickly and in various formats";
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, pkg-config
|
||||
, curl
|
||||
, openssl
|
||||
, jansson
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediasynclite";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iBroadcastMediaServices";
|
||||
repo = "MediaSyncLiteLinux";
|
||||
rev = version;
|
||||
hash = "sha256-ToSkR6tPJMBCcj1NUBAywKjCAPlpmh+ngIopFrT2PIA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
glib
|
||||
gtk3
|
||||
openssl
|
||||
jansson
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gsettings-desktop-schemas
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postPatch = ''
|
||||
substitute ./src/ibmsl.c ./src/ibmsl.c --subst-var out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Linux-native graphical uploader for iBroadcast";
|
||||
downloadPage = "https://github.com/tobz619/MediaSyncLiteLinuxNix";
|
||||
homepage = "https://github.com/iBroadcastMediaServices/MediaSyncLiteLinux";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ tobz619 ];
|
||||
};
|
||||
}
|
||||
+10
-10
@@ -7,6 +7,7 @@
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook3
|
||||
, gtk3
|
||||
, libgee
|
||||
, pantheon
|
||||
@@ -14,25 +15,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "1.1.2";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ=";
|
||||
hash = "sha256-P3eM+xgsAMvqr2mIEjkQSjhxvQAwtSNItxAUcjO3ciY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-paths.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -42,12 +40,14 @@ stdenv.mkDerivation rec {
|
||||
elementary-files # settings schemas
|
||||
elementary-terminal # settings schemas
|
||||
granite
|
||||
switchboard
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
|
||||
substituteInPlace src/Settings/ThemeSettings.vala \
|
||||
--replace-fail "/usr/share/" "/run/current-system/sw/share/"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
@@ -55,15 +55,15 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial system settings panel for Pantheon";
|
||||
description = "Unofficial system customization app for Pantheon";
|
||||
longDescription = ''
|
||||
Unofficial system settings panel for Pantheon
|
||||
Unofficial system customization app for Pantheon
|
||||
that lets you easily and safely customise your desktop's appearance.
|
||||
Use programs.pantheon-tweaks.enable to add this to your switchboard.
|
||||
'';
|
||||
homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
mainProgram = "pantheon-tweaks";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
lib
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "physac";
|
||||
version = "2.5-unstable-2023-12-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "victorfisac";
|
||||
repo = "Physac";
|
||||
rev = "29d9fc06860b54571a02402fff6fa8572d19bd12";
|
||||
hash = "sha256-PTlV1tT0axQbmGmJ7JD1n6wmbIxUdu7xho78EO0HNNk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{include,lib/pkgconfig}
|
||||
|
||||
install -Dm644 $src/src/physac.h $out/include/physac.h
|
||||
|
||||
cat <<EOF > $out/lib/pkgconfig/physac.pc
|
||||
prefix=$out
|
||||
includedir=$out/include
|
||||
|
||||
Name: physac
|
||||
Description: ${finalAttrs.meta.description}
|
||||
URL: ${finalAttrs.meta.homepage}
|
||||
Version: ${finalAttrs.version}
|
||||
Cflags: -I"{includedir}"
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "2D physics header-only library for raylib";
|
||||
homepage = "https://github.com/victorfisac/Physac";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,59 @@
|
||||
{ rustPlatform
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, perl
|
||||
, openssl
|
||||
, lib
|
||||
, darwin
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "r0vm";
|
||||
version = "0.21.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "risc0";
|
||||
repo = "risc0";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BIQd6yX453v4w8aU+2awcngOE6t4oIf7BseVLgPG4Bw=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "risc0/r0vm";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
perl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl.dev
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-OsxCIFgJiHfx52nRYRNLTB501RGKSBPQs2MQAs/BFfc=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
# see https://github.com/risc0/risc0/blob/v0.21.0/risc0/circuit/recursion/build.rs
|
||||
sha256Hash = "3504a2542626acb974dea1ae5542c90c032c4ef42f230977f40f245442a1ec23";
|
||||
recursionZkr = fetchurl {
|
||||
name = "recursion_zkr.zip";
|
||||
url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip";
|
||||
sha256 = "sha256:08zcl515890gyivhj8rgyi72q0qcr515bbm1vrsbkb164raa411m";
|
||||
};
|
||||
in
|
||||
''
|
||||
ln -sf ${recursionZkr} ./risc0/circuit/recursion/src/recursion_zkr.zip
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "RISC Zero zero-knowledge VM";
|
||||
homepage = "https://github.com/risc0/risc0";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ marijanp ];
|
||||
mainProgram = "r0vm";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
lib
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "raygui";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raysan5";
|
||||
repo = "raygui";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-1qnChZYsb0e5LnPhvs6a/R5Ammgj2HWFNe9625sBRo8=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{include,lib/pkgconfig}
|
||||
|
||||
install -Dm644 $src/src/raygui.h $out/include/raygui.h
|
||||
|
||||
cat <<EOF > $out/lib/pkgconfig/raygui.pc
|
||||
prefix=$out
|
||||
includedir=$out/include
|
||||
|
||||
Name: raygui
|
||||
Description: ${finalAttrs.meta.description}
|
||||
URL: ${finalAttrs.meta.homepage}
|
||||
Version: ${finalAttrs.version}
|
||||
Cflags: -I"{includedir}"
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A simple and easy-to-use immediate-mode gui library";
|
||||
homepage = "https://github.com/raysan5/raygui";
|
||||
license = lib.licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
php,
|
||||
testers,
|
||||
roave-backward-compatibility-check,
|
||||
}:
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "roave-backward-compatibility-check";
|
||||
version = "8.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roave";
|
||||
repo = "BackwardCompatibilityCheck";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-/9nJqZcuBLzgzDyoX4NHW9And7L/F+Bsm/gLzQS7QzE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-I8JZ4CBrrQmZ38QF9SPZtkPirCAxqSCeTUpMg59Mz7U=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = roave-backward-compatibility-check;
|
||||
version = finalAttrs.version;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Roave/BackwardCompatibilityCheck/releases/tag/${finalAttrs.version}";
|
||||
description = "A tool that can be used to verify BC breaks between two versions of a PHP library";
|
||||
homepage = "https://github.com/Roave/BackwardCompatibilityCheck";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "roave-backward-compatibility-check";
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
})
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "elementary-gtk-theme";
|
||||
version = "7.3.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "stylesheet";
|
||||
rev = version;
|
||||
sha256 = "sha256-KrpeDQH43n7seeSPVYKETxy1g0JuUowZerjgktLQg/4=";
|
||||
sha256 = "sha256-O0Zu/ZxVANfWKcCkOF7jeJa3oG1ut56px7jeFK7LdKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -221,10 +221,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
### THIRD-PARTY
|
||||
|
||||
# Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party,
|
||||
# specifically third party switchboard plugins and wingpanel indicators.
|
||||
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
|
||||
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
||||
# As suggested in https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
||||
# please avoid putting third-party packages in the `pantheon` scope.
|
||||
|
||||
}) // lib.optionalAttrs config.allowAliases {
|
||||
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala
|
||||
index 589121b..8e9c81e 100644
|
||||
--- a/src/Settings/ThemeSettings.vala
|
||||
+++ b/src/Settings/ThemeSettings.vala
|
||||
@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings {
|
||||
var themes = new Gee.ArrayList<string> ();
|
||||
|
||||
string[] dirs = {
|
||||
- "/usr/share/" + path + "/",
|
||||
+ "/run/current-system/sw/share/" + path + "/",
|
||||
Environment.get_home_dir () + "/." + path + "/",
|
||||
Environment.get_home_dir () + "/.local/share/" + path + "/"};
|
||||
|
||||
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ext/package-templates/configure \
|
||||
--replace "#!/usr/bin/env gosh" "#!$out/bin/gosh"
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nghttp3";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kJt4aQGNiJ0XhlEKunR8jYKytv3rh23jRrNelCDe/Kk=";
|
||||
hash = "sha256-MPycG8Fd7GJnp7WyFlGzbuTCYIF+xq6I7oeqXKFOehQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "eio_linux";
|
||||
inherit (eio) meta src version;
|
||||
inherit (eio) meta src patches version;
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "eio_main";
|
||||
inherit (eio) meta src version;
|
||||
inherit (eio) meta src patches version;
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "eio_posix";
|
||||
inherit (eio) meta src version;
|
||||
inherit (eio) meta src patches version;
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
|
||||
|
||||
@@ -2,45 +2,49 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
mock,
|
||||
boto,
|
||||
pytest,
|
||||
boto3,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amazon-kclpy";
|
||||
version = "2.1.3";
|
||||
format = "setuptools";
|
||||
version = "2.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "amazon-kinesis-client-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3BhccRJd6quElXZSix1aVIqWr9wdcTTziDhnIOLiPPo=";
|
||||
hash = "sha256-TWIGu7WuoaPhk8cz+hMXvGLIPQ5kly8aj20ZtvTZzwg=";
|
||||
};
|
||||
|
||||
# argparse is just required for python2.6
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'argparse'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mock
|
||||
boto
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-deprecated-boto.patch";
|
||||
url = "https://github.com/awslabs/amazon-kinesis-client-python/commit/bd2c442cdd1b0e2c99d3471c1d3ffcc9161a7c42.patch";
|
||||
hash = "sha256-5W0qItDGjx1F6IllzLH57XCpToKrAu9mTbzv/1wMXuY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m pytest
|
||||
'';
|
||||
dependencies = [
|
||||
mock
|
||||
boto3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "amazon_kclpy" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Amazon Kinesis Client Library for Python";
|
||||
homepage = "https://github.com/awslabs/amazon-kinesis-client-python";
|
||||
license = licenses.amazonsl;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ psyanticy ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, django-redis
|
||||
, fetchFromGitHub
|
||||
, pymemcache
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-ratelimit";
|
||||
version = "4.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsocol";
|
||||
repo = "django-ratelimit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZMtZSKOIIRSqH6eyC7bBeua7YLKyWW6NOXN/MDv9fy4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django-redis
|
||||
pymemcache
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_ratelimit"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export DJANGO_SETTINGS_MODULE=test_settings
|
||||
python -m django test django_ratelimit
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cache-based rate-limiting for Django";
|
||||
homepage = "https://github.com/jsocol/django-ratelimit";
|
||||
changelog = "https://github.com/jsocol/django-ratelimit/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ derdennisop ];
|
||||
};
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
@@ -42,5 +43,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,36 +9,34 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "115";
|
||||
version = "116";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NjzONVSJ4GEaIeC5ytnTi8JpZY1yIq3LN8vbMy3n0vs=";
|
||||
hash = "sha256-XtcAs+xKSTJcQN0mCj6ewkT7owvA7nlZ8PhWfL9NZh8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov=pydeconz --cov-report term-missing" "" \
|
||||
--replace "setuptools==" "setuptools>=" \
|
||||
--replace "wheel==" "wheel>="
|
||||
--replace-fail "--cov=pydeconz --cov-report term-missing" "" \
|
||||
--replace-fail "setuptools==" "setuptools>=" \
|
||||
--replace-fail "wheel==" "wheel>="
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
orjson
|
||||
];
|
||||
@@ -53,10 +51,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library wrapping the Deconz REST API";
|
||||
mainProgram = "pydeconz";
|
||||
homepage = "https://github.com/Kane610/deconz";
|
||||
changelog = "https://github.com/Kane610/deconz/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "pydeconz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit (shiboken6) version src;
|
||||
|
||||
patches = [
|
||||
# stripped down version of https://github.com/pyside/pyside-setup/commit/a0d68856d67ce6e178e3cfc2fccc236707e02fcd
|
||||
# FIXME: remove in next release
|
||||
./qt-6.7.1.patch
|
||||
];
|
||||
|
||||
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
|
||||
|
||||
# FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
--- a/PySide6/QtMultimedia/CMakeLists.txt
|
||||
+++ b/PySide6/QtMultimedia/CMakeLists.txt
|
||||
@@ -12,6 +12,7 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp
|
||||
+${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp
|
||||
@@ -28,7 +29,6 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp
|
||||
-${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp
|
||||
${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp
|
||||
diff --git a/PySide6/QtMultimedia/typesystem_multimedia.xml b/PySide6/QtMultimedia/typesystem_multimedia.xml
|
||||
index dd58f41cc..d37eb15fd 100644
|
||||
--- a/PySide6/QtMultimedia/typesystem_multimedia.xml
|
||||
+++ b/PySide6/QtMultimedia/typesystem_multimedia.xml
|
||||
@@ -9,7 +9,7 @@
|
||||
<load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
|
||||
<load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
|
||||
|
||||
- <namespace-type name="QtAudio">
|
||||
+ <namespace-type name="QAudio">
|
||||
<enum-type name="Error"/>
|
||||
<enum-type name="State"/>
|
||||
<enum-type name="VolumeScale"/>
|
||||
@@ -65,9 +65,6 @@
|
||||
</modify-argument>
|
||||
</modify-function>
|
||||
<modify-function signature="stop()" allow-thread="true"/>
|
||||
- <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) -->
|
||||
- <declare-function signature="state()const" return-type="QtAudio::State"/>
|
||||
- <declare-function signature="error()const" return-type="QtAudio::Error"/>
|
||||
</object-type>
|
||||
|
||||
<object-type name="QAudioSink">
|
||||
@@ -82,9 +79,6 @@
|
||||
</modify-argument>
|
||||
</modify-function>
|
||||
<modify-function signature="stop()" allow-thread="true"/>
|
||||
- <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) -->
|
||||
- <declare-function signature="state()const" return-type="QtAudio::State"/>
|
||||
- <declare-function signature="error()const" return-type="QtAudio::Error"/>
|
||||
</object-type>
|
||||
|
||||
<object-type name="QCamera">
|
||||
diff --git a/PySide6/glue/qtmultimedia.cpp b/PySide6/glue/qtmultimedia.cpp
|
||||
index d193b1bd3..ac8434b97 100644
|
||||
--- a/PySide6/glue/qtmultimedia.cpp
|
||||
+++ b/PySide6/glue/qtmultimedia.cpp
|
||||
@@ -2,6 +2,7 @@
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
// @snippet qvideoframe-bits
|
||||
+#include "object.h"
|
||||
%BEGIN_ALLOW_THREADS
|
||||
%RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1);
|
||||
%END_ALLOW_THREADS
|
||||
@@ -23,5 +24,5 @@ const auto size = %CPPSELF.byteCount();
|
||||
|
||||
// @snippet qtaudio-namespace-compatibility-alias
|
||||
Py_INCREF(pyType);
|
||||
-PyModule_AddObject(module, "QAudio", reinterpret_cast<PyObject *>(pyType));
|
||||
+PyModule_AddObject(module, "QtAudio", reinterpret_cast<PyObject *>(pyType));
|
||||
// @snippet qtaudio-namespace-compatibility-alias
|
||||
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
|
||||
index 625e4a405..557f130e0 100644
|
||||
--- a/libpyside/signalmanager.cpp
|
||||
+++ b/libpyside/signalmanager.cpp
|
||||
@@ -813,11 +813,6 @@ static PyObject *parseArguments(const QMetaMethod &method, void **args)
|
||||
for (qsizetype i = 0; i < argsSize; ++i) {
|
||||
void *data = args[i+1];
|
||||
auto param = paramTypes.at(i);
|
||||
-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
|
||||
- // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals
|
||||
- if (param.startsWith("QAudio::"_ba))
|
||||
- param.insert(1, 't');
|
||||
-#endif
|
||||
Shiboken::Conversions::SpecificConverter converter(param.constData());
|
||||
if (!converter) {
|
||||
PyErr_SetString(PyExc_TypeError, msgCannotConvertParameter(method, i).constData());
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pbr,
|
||||
appdirs,
|
||||
cliff,
|
||||
dogpile-cache,
|
||||
jsonschema,
|
||||
@@ -11,12 +9,14 @@
|
||||
openstacksdk,
|
||||
osc-lib,
|
||||
oslo-utils,
|
||||
oslotest,
|
||||
pbr,
|
||||
platformdirs,
|
||||
pyyaml,
|
||||
requests,
|
||||
stevedore,
|
||||
stestr,
|
||||
requests-mock,
|
||||
oslotest,
|
||||
stestr,
|
||||
stevedore,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -30,8 +30,6 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pbr
|
||||
appdirs
|
||||
cliff
|
||||
dogpile-cache
|
||||
jsonschema
|
||||
@@ -39,6 +37,8 @@ buildPythonPackage rec {
|
||||
openstacksdk
|
||||
osc-lib
|
||||
oslo-utils
|
||||
pbr
|
||||
platformdirs
|
||||
pyyaml
|
||||
requests
|
||||
stevedore
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
cffi,
|
||||
pkg-config,
|
||||
glfw,
|
||||
libffi,
|
||||
raylib,
|
||||
physac,
|
||||
raygui,
|
||||
lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "raylib-python-cffi";
|
||||
version = "5.0.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electronstudio";
|
||||
repo = "raylib-python-cffi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DlnZRJZ0ZnkLii09grA/lGsJHPUYrbaJ55BVWJ8JzfM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
dependencies = [ cffi ];
|
||||
|
||||
patches = [
|
||||
# This patch fixes to the builder script function to call pkg-config
|
||||
# using the library name rather than searching only through raylib
|
||||
./fix_pyray_builder.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# tests require a graphic environment
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pyray" ];
|
||||
|
||||
buildInputs = [
|
||||
glfw
|
||||
libffi
|
||||
raylib
|
||||
physac
|
||||
raygui
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python CFFI bindings for Raylib";
|
||||
homepage = "https://electronstudio.github.io/raylib-python-cffi";
|
||||
license = lib.licenses.epl20;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
--- a/raylib/build.py 2024-05-18 18:36:26.911488056 +0200
|
||||
+++ b/raylib/build.py 2024-05-18 18:40:04.770587090 +0200
|
||||
@@ -32,8 +32,8 @@
|
||||
return subprocess.run(['pkg-config', '--exists', 'raylib'], text=True, stdout=subprocess.PIPE).returncode == 0
|
||||
|
||||
|
||||
-def get_the_include_path():
|
||||
- return subprocess.run(['pkg-config', '--variable=includedir', 'raylib'], text=True,
|
||||
+def get_the_include_path(libname):
|
||||
+ return subprocess.run(['pkg-config', '--variable=includedir', libname], text=True,
|
||||
stdout=subprocess.PIPE).stdout.strip()
|
||||
|
||||
|
||||
@@ -106,9 +106,9 @@
|
||||
if not check_raylib_installed():
|
||||
raise Exception("ERROR: raylib not found by pkg-config. Please install pkg-config and Raylib.")
|
||||
|
||||
- raylib_h = get_the_include_path() + "/raylib.h"
|
||||
- rlgl_h = get_the_include_path() + "/rlgl.h"
|
||||
- raymath_h = get_the_include_path() + "/raymath.h"
|
||||
+ raylib_h = get_the_include_path("raylib") + "/raylib.h"
|
||||
+ rlgl_h = get_the_include_path("raylib") + "/rlgl.h"
|
||||
+ raymath_h = get_the_include_path("raylib") + "/raymath.h"
|
||||
|
||||
if not os.path.isfile(raylib_h):
|
||||
raise Exception("ERROR: " + raylib_h + " not found. Please install Raylib.")
|
||||
@@ -125,13 +125,13 @@
|
||||
#include "raymath.h"
|
||||
"""
|
||||
|
||||
- glfw3_h = get_the_include_path() + "/GLFW/glfw3.h"
|
||||
+ glfw3_h = get_the_include_path("glfw3") + "/GLFW/glfw3.h"
|
||||
if check_header_exists(glfw3_h):
|
||||
ffi_includes += """
|
||||
#include "GLFW/glfw3.h"
|
||||
"""
|
||||
|
||||
- raygui_h = get_the_include_path() + "/raygui.h"
|
||||
+ raygui_h = get_the_include_path("raygui") + "/raygui.h"
|
||||
if check_header_exists(raygui_h):
|
||||
ffi_includes += """
|
||||
#define RAYGUI_IMPLEMENTATION
|
||||
@@ -139,7 +139,7 @@
|
||||
#include "raygui.h"
|
||||
"""
|
||||
|
||||
- physac_h = get_the_include_path() + "/physac.h"
|
||||
+ physac_h = get_the_include_path("physac") + "/physac.h"
|
||||
if check_header_exists(physac_h):
|
||||
ffi_includes += """
|
||||
#define PHYSAC_IMPLEMENTATION
|
||||
@@ -172,7 +172,7 @@
|
||||
|
||||
ffibuilder.set_source("raylib._raylib_cffi",
|
||||
ffi_includes,
|
||||
- include_dirs=[get_the_include_path()],
|
||||
+ include_dirs=[get_the_include_path("libffi")],
|
||||
extra_link_args=extra_link_args,
|
||||
extra_compile_args=extra_compile_args,
|
||||
libraries=libraries)
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "truststore";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-K11nHzpckNR8pqmgLOo/yCJ2cNQnqPHgjMDPQkpeRkQ=";
|
||||
hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vintagestory";
|
||||
version = "1.19.7";
|
||||
version = "1.19.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
|
||||
hash = "sha256-C+vPsoMlo6EKmzf+XkvIhrDGG7EccU8c36GZt0/1r1Q=";
|
||||
hash = "sha256-R6J+ACYDQpOzJZFBizsQGOexR7lMyeoZqz9TnWxfwyM=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
generateSplicesForMkScope,
|
||||
makeScopeWithSplicing',
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
libsForQt5,
|
||||
qt6Packages,
|
||||
cmark,
|
||||
@@ -65,6 +64,7 @@
|
||||
kdiagram = self.callPackage ./misc/kdiagram {};
|
||||
kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
|
||||
kirigami-addons = self.callPackage ./misc/kirigami-addons {};
|
||||
kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
|
||||
kio-fuse = self.callPackage ./misc/kio-fuse {};
|
||||
ktextaddons = self.callPackage ./misc/ktextaddons {};
|
||||
kunifiedpush = self.callPackage ./misc/kunifiedpush {};
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
{mkKdeDerivation}:
|
||||
mkKdeDerivation {
|
||||
pname = "accessibility-inspector";
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
cargo,
|
||||
rustc,
|
||||
# provided as callPackage input to enable easier overrides through overlays
|
||||
cargoHash ? "sha256-fY0mQiYS/CMThOVsWp8NgxpWfUph2dZ7hj7W5JUJ2J4=",
|
||||
cargoHash ? "sha256-xT1SkW5iJy5Y9CK0CSxp+08XXjrbljxZzwYo2fEqxYE=",
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "akonadi-search";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
cargo,
|
||||
rustc,
|
||||
# provided as callPackage input to enable easier overrides through overlays
|
||||
cargoHash ? "sha256-QJZJqdixPThgiKnruKetmzhbvtY/MsGy4v+OdQiEFR8=",
|
||||
cargoHash ? "sha256-94f4DKRXcp3o6l3zbQzCpH2ZOztZMEAHa9ookPxbeDU=",
|
||||
qcoro,
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
libcdio,
|
||||
libcdio-paranoia,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "audex";
|
||||
|
||||
extraBuildInputs = [libcdio libcdio-paranoia];
|
||||
}
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "bovo";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "bovo";
|
||||
}
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
qqc2-desktop-style,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "calindori";
|
||||
|
||||
extraBuildInputs = [
|
||||
qtsvg
|
||||
qqc2-desktop-style
|
||||
];
|
||||
# FIXME(qt5)
|
||||
meta.broken = true;
|
||||
extraBuildInputs = [qtsvg];
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{callPackage}: {
|
||||
accessibility-inspector = callPackage ./accessibility-inspector {};
|
||||
akonadi = callPackage ./akonadi {};
|
||||
akonadi-calendar = callPackage ./akonadi-calendar {};
|
||||
akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {};
|
||||
@@ -15,6 +16,7 @@
|
||||
arianna = callPackage ./arianna {};
|
||||
ark = callPackage ./ark {};
|
||||
artikulate = callPackage ./artikulate {};
|
||||
audex = callPackage ./audex {};
|
||||
audiocd-kio = callPackage ./audiocd-kio {};
|
||||
audiotube = callPackage ./audiotube {};
|
||||
baloo-widgets = callPackage ./baloo-widgets {};
|
||||
@@ -34,6 +36,7 @@
|
||||
falkon = callPackage ./falkon {};
|
||||
ffmpegthumbs = callPackage ./ffmpegthumbs {};
|
||||
filelight = callPackage ./filelight {};
|
||||
francis = callPackage ./francis {};
|
||||
ghostwriter = callPackage ./ghostwriter {};
|
||||
granatier = callPackage ./granatier {};
|
||||
grantlee-editor = callPackage ./grantlee-editor {};
|
||||
@@ -51,6 +54,7 @@
|
||||
kalarm = callPackage ./kalarm {};
|
||||
kalgebra = callPackage ./kalgebra {};
|
||||
kalk = callPackage ./kalk {};
|
||||
kalm = callPackage ./kalm {};
|
||||
kalzium = callPackage ./kalzium {};
|
||||
kamera = callPackage ./kamera {};
|
||||
kamoso = callPackage ./kamoso {};
|
||||
@@ -112,7 +116,6 @@
|
||||
kimap = callPackage ./kimap {};
|
||||
kio-admin = callPackage ./kio-admin {};
|
||||
kio-extras = callPackage ./kio-extras {};
|
||||
kio-extras-kf5 = callPackage ./kio-extras-kf5 {};
|
||||
kio-gdrive = callPackage ./kio-gdrive {};
|
||||
kio-zeroconf = callPackage ./kio-zeroconf {};
|
||||
kipi-plugins = callPackage ./kipi-plugins {};
|
||||
@@ -236,6 +239,7 @@
|
||||
signon-kwallet-extension = callPackage ./signon-kwallet-extension {};
|
||||
skanlite = callPackage ./skanlite {};
|
||||
skanpage = callPackage ./skanpage {};
|
||||
skladnik = callPackage ./skladnik {};
|
||||
spectacle = callPackage ./spectacle {};
|
||||
step = callPackage ./step {};
|
||||
svgpart = callPackage ./svgpart {};
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "francis";
|
||||
|
||||
extraBuildInputs = [qtsvg];
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
{mkKdeDerivation}:
|
||||
mkKdeDerivation {
|
||||
pname = "kalm";
|
||||
}
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "katomic";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "katomic";
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kblackbox";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "kblackbox";
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kbounce";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "kbounce";
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
corrosion,
|
||||
alpaka,
|
||||
# provided as callPackage input to enable easier overrides through overlays
|
||||
cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=",
|
||||
cargoHash ? "sha256-AMOgchdx9754rkGJg8IdsNgYgH8esnlrreuY5AFZlwE=",
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "kdepim-addons";
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kfourinline";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kjumpingcube";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "kjumpingcube";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "klickety";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "klickety";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "klines";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "klines";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kmines";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "kmines";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "knavalbattle";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "knavalbattle";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kolf";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "kolf";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{mkKdeDerivation}:
|
||||
{
|
||||
mkKdeDerivation,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kollision";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "kollision";
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kreversi";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "kreversi";
|
||||
}
|
||||
|
||||
@@ -1,28 +1,18 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
qtwayland,
|
||||
libvncserver,
|
||||
pipewire,
|
||||
xorg,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "krfb";
|
||||
|
||||
# Backports.
|
||||
# FIXME: remove in next release
|
||||
patches = [
|
||||
# Build fix for Qt 6.7.1
|
||||
./fix-build-with-qt-6.7.1.diff
|
||||
# Wayland crash fix
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/network/krfb/-/commit/6e7a5ba56966ea1b67400be9ab7c82885abb76be.diff";
|
||||
hash = "sha256-kqD4B2Nixw8KMCOc4RpoEmvII2JZYBPxog6TT/BPuFs=";
|
||||
})
|
||||
];
|
||||
|
||||
extraCmakeFlags = [
|
||||
"-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
|
||||
];
|
||||
|
||||
extraBuildInputs = [qtwayland libvncserver xorg.libXdamage];
|
||||
extraNativeBuildInputs = [pkg-config];
|
||||
extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage];
|
||||
}
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt
|
||||
index 99f4562..3bf5f63 100644
|
||||
--- a/framebuffers/pipewire/CMakeLists.txt
|
||||
+++ b/framebuffers/pipewire/CMakeLists.txt
|
||||
@@ -9,11 +9,6 @@ set (krfb_framebuffer_pw_SRCS
|
||||
screencasting.cpp
|
||||
)
|
||||
|
||||
-ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS
|
||||
- PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
|
||||
- BASENAME zkde-screencast-unstable-v1
|
||||
-)
|
||||
-
|
||||
ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
|
||||
HEADER krfb_fb_pipewire_debug.h
|
||||
IDENTIFIER KRFB_FB_PIPEWIRE
|
||||
@@ -38,6 +33,18 @@ add_library(krfb_framebuffer_pw
|
||||
MODULE
|
||||
${krfb_framebuffer_pw_SRCS}
|
||||
)
|
||||
+
|
||||
+if (Qt6_VERSION VERSION_LESS "6.7.1")
|
||||
+ ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw
|
||||
+ PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
|
||||
+ BASENAME zkde-screencast-unstable-v1
|
||||
+ )
|
||||
+else()
|
||||
+ qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw
|
||||
+ FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
|
||||
|
||||
target_link_libraries(krfb_framebuffer_pw
|
||||
diff --git a/framebuffers/pipewire/screencasting.cpp b/framebuffers/pipewire/screencasting.cpp
|
||||
index 3c4d1ab..c338699 100644
|
||||
--- a/framebuffers/pipewire/screencasting.cpp
|
||||
+++ b/framebuffers/pipewire/screencasting.cpp
|
||||
@@ -5,7 +5,11 @@
|
||||
*/
|
||||
|
||||
#include "screencasting.h"
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1)
|
||||
#include "qwayland-zkde-screencast-unstable-v1.h"
|
||||
+#else
|
||||
+#include "qwayland-screencast.h"
|
||||
+#endif
|
||||
#include <KWayland/Client/registry.h>
|
||||
#include <QDebug>
|
||||
#include <QRect>
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "ksudoku";
|
||||
|
||||
extraBuildInputs = [qtsvg];
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
|
||||
meta.mainProgram = "ksudoku";
|
||||
}
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
libGLU,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kubrick";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg libGLU];
|
||||
|
||||
meta.mainProgram = "kubrick";
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "lskat";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "lskat";
|
||||
}
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
_7zz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "picmi";
|
||||
|
||||
extraNativeBuildInputs = [_7zz];
|
||||
extraBuildInputs = [qtsvg];
|
||||
|
||||
meta.mainProgram = "picmi";
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtwebengine,
|
||||
tesseractLanguages ? [],
|
||||
tesseract5,
|
||||
leptonica,
|
||||
@@ -8,6 +9,7 @@ mkKdeDerivation {
|
||||
pname = "skanpage";
|
||||
|
||||
extraBuildInputs = [
|
||||
qtwebengine
|
||||
(tesseract5.override {enableLanguages = tesseractLanguages;})
|
||||
leptonica
|
||||
];
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
{mkKdeDerivation}:
|
||||
mkKdeDerivation {
|
||||
pname = "skladnik";
|
||||
}
|
||||
@@ -2,10 +2,11 @@
|
||||
mkKdeDerivation,
|
||||
qtwayland,
|
||||
qtmultimedia,
|
||||
opencv,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "spectacle";
|
||||
|
||||
extraBuildInputs = [qtwayland qtmultimedia];
|
||||
extraBuildInputs = [qtwayland qtmultimedia opencv];
|
||||
meta.mainProgram = "spectacle";
|
||||
}
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
{
|
||||
"accessibility-inspector": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"akonadi": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
@@ -159,6 +168,11 @@
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"audex": [
|
||||
"CC0-1.0",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-or-later"
|
||||
],
|
||||
"audiocd-kio": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
@@ -255,9 +269,11 @@
|
||||
"CC0-1.0"
|
||||
],
|
||||
"breeze-icons": [
|
||||
"CC-BY-SA-4.0",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
@@ -331,8 +347,7 @@
|
||||
],
|
||||
"dolphin-plugins": [
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later",
|
||||
"MIT"
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"dragon": [
|
||||
"CC0-1.0",
|
||||
@@ -413,6 +428,14 @@
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"francis": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"ghostwriter": [
|
||||
"Apache-2.0",
|
||||
"BSD-3-Clause",
|
||||
@@ -527,6 +550,11 @@
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-or-later"
|
||||
],
|
||||
"kalm": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"kalzium": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
@@ -1266,23 +1294,6 @@
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
"MIT"
|
||||
],
|
||||
"kio-extras-kf5": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
"MIT"
|
||||
],
|
||||
"kio-gdrive": [
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
@@ -1301,6 +1312,7 @@
|
||||
"CC0-1.0"
|
||||
],
|
||||
"kirigami": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"FSFAP",
|
||||
@@ -1419,10 +1431,12 @@
|
||||
"Qt-Commercial-exception-1.0"
|
||||
],
|
||||
"kmail-account-wizard": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-or-later"
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"kmailtransport": [
|
||||
"BSD-3-Clause",
|
||||
@@ -1470,6 +1484,7 @@
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"knavalbattle": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
@@ -1533,6 +1548,7 @@
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"kolf": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0"
|
||||
],
|
||||
"kollision": [
|
||||
@@ -1610,7 +1626,6 @@
|
||||
"BSD-3-Clause",
|
||||
"CC-BY-SA-4.0",
|
||||
"CC0-1.0",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later"
|
||||
],
|
||||
"konversation": [
|
||||
@@ -1938,6 +1953,7 @@
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"kubrick": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
@@ -2360,7 +2376,6 @@
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
@@ -2397,7 +2412,8 @@
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"MIT"
|
||||
],
|
||||
"partitionmanager": [
|
||||
"CC-BY-4.0",
|
||||
@@ -2705,7 +2721,8 @@
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
"LicenseRef-KFQF-Accepted-GPL",
|
||||
"LicenseRef-Qt-Commercial"
|
||||
"LicenseRef-Qt-Commercial",
|
||||
"MIT"
|
||||
],
|
||||
"rocs": [
|
||||
"BSD-2-Clause",
|
||||
@@ -2741,6 +2758,13 @@
|
||||
"GPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
],
|
||||
"skladnik": [
|
||||
"BSD-3-Clause",
|
||||
"CC-BY-SA-4.0",
|
||||
"CC0-1.0",
|
||||
"GFDL-1.2-or-later",
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"solid": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
stdenv,
|
||||
sources,
|
||||
fetchurl,
|
||||
kio-extras,
|
||||
cmake,
|
||||
libsForQt5,
|
||||
@@ -14,11 +14,16 @@
|
||||
taglib,
|
||||
libappimage,
|
||||
}:
|
||||
# kio-extras-kf5 is kind of part of Gear, but also not released all the time,
|
||||
# so handle it separately.
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kio-extras-kf5";
|
||||
inherit (sources.${pname}) version;
|
||||
version = "24.02.2";
|
||||
|
||||
src = sources.${pname};
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/release-service/${version}/src/kio-extras-kf5-${version}.tar.xz";
|
||||
hash = "sha256-qar1jzuALINBu6HOuVBU+RUFnqRH9Z/8e5M8ynGxKsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with libsForQt5; [
|
||||
cmake
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "autotiling";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u+Tvvge/rQvylbZDmCxvoMGjZm2gKsFZEAb9evR/Ckw=";
|
||||
hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ i3ipc importlib-metadata ];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, coreutils
|
||||
|
||||
, perl
|
||||
@@ -21,21 +22,30 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "multipath-tools";
|
||||
version = "0.9.6";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opensvc";
|
||||
repo = "multipath-tools";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-X4sAMGn4oBMY3cQkVj1dMcrDF7FgMl8SbZeUnCCOY6Q=";
|
||||
sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport build fix for musl libc 1.2.5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch";
|
||||
hash = "sha256-ZvNFVphB9f+S/XMxktR6P/YYSTLeJXEsj4XrAnw6GUI=";
|
||||
excludes = ["tests/util.c"];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace create-config.mk \
|
||||
--replace /bin/echo ${coreutils}/bin/echo
|
||||
--replace-fail /bin/echo ${coreutils}/bin/echo
|
||||
|
||||
substituteInPlace multipathd/multipathd.service \
|
||||
--replace /sbin/multipathd "$out/bin/multipathd"
|
||||
substituteInPlace multipathd/multipathd.service.in \
|
||||
--replace-fail /sbin/multipathd "$out/bin/multipathd"
|
||||
|
||||
sed -i -re '
|
||||
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
|
||||
@@ -76,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
# skip test attempting to access /sys/dev/block
|
||||
substituteInPlace tests/Makefile --replace ' devt ' ' '
|
||||
substituteInPlace tests/Makefile --replace-fail ' devt ' ' '
|
||||
'';
|
||||
nativeCheckInputs = [ cmocka ];
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, fetchFromSourcehut, rustPlatform, pkg-config, dbus }:
|
||||
{ lib, fetchFromSourcehut, rustPlatform, nix-update-script }:
|
||||
|
||||
let version = "0.3.0";
|
||||
let version = "0.4.0";
|
||||
in rustPlatform.buildRustPackage {
|
||||
pname = "sd-switch";
|
||||
inherit version;
|
||||
@@ -9,18 +9,20 @@ in rustPlatform.buildRustPackage {
|
||||
owner = "~rycee";
|
||||
repo = "sd-switch";
|
||||
rev = version;
|
||||
hash = "sha256-mWrLbCUnoJ3hVtpSU/7dw91U5TLyw5kNchX5nmP9asA=";
|
||||
hash = "sha256-PPFYH34HAD/vC+9jpA1iPQRVNR6MX8ncSPC+7bl2oHY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VK+kPX1pGhowbWKkUs1PL0DXIhDXJOFVoIHTtWQcWEs=";
|
||||
cargoHash = "sha256-zUoa7nPNFvnYekbEZwtnJKZ6qd47Sb4LZGEkaKVQ9ZQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus ];
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A systemd unit switcher for Home Manager";
|
||||
mainProgram = "sd-switch";
|
||||
homepage = "https://gitlab.com/rycee/sd-switch";
|
||||
homepage = "https://git.sr.ht/~rycee/sd-switch";
|
||||
changelog = "https://git.sr.ht/~rycee/sd-switch/refs/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ rycee ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dufs";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigoden";
|
||||
repo = "dufs";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BoFoF7V6bTQiJ+afGnivviU/s2ikOxAX06s+AwRxo8Q=";
|
||||
hash = "sha256-Ab/f6n2n24mLsWS4WF6jOBt9m7dyeSP0ftYixKANsjY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B0K/lco7suYM0/02LaDbeqyt4zyiwoeBxhmUPsVTvkw=";
|
||||
cargoHash = "sha256-CNHDZHyg4jrEl3hmdQ7ITCtg9iTmB2RwDAzqSirOCO4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -130,6 +130,9 @@ stdenv.mkDerivation {
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=gnu-folding-constant"
|
||||
"-Wno-error=unused-but-set-variable"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
# fix sys/cdefs.h is deprecated
|
||||
"-Wno-error=cpp"
|
||||
]);
|
||||
|
||||
configurePlatforms = [];
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "awslogs";
|
||||
version = "0.14.0";
|
||||
format = "setuptools";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgebastida";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DrW8s0omQqLp1gaoR6k/YR11afRjUbGYrFtfYhby2b8=";
|
||||
sha256 = "sha256-o6xZqwlqAy01P+TZ0rB5rpEddWNUBzzHp7/cycpcwes=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@@ -24,19 +24,14 @@ python3.pkgs.buildPythonApplication rec {
|
||||
jmespath
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "jmespath>=0.7.1,<1.0.0" "jmespath>=0.7.1" \
|
||||
--replace '>=3.5.*' '>=3.5'
|
||||
--replace "boto3>=1.34.75" "boto3>=1.34.58" \
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_main_get_query"
|
||||
"test_main_get_with_color"
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gfxreconstruct";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LunarG";
|
||||
repo = "gfxreconstruct";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4qNAMPswsYtzHmTKr+waDLoWa9xex5hvX1Og/KibiBg=";
|
||||
hash = "sha256-MuCdJoBFxKwDCOCltlU3oBS9elFS6F251dHjHcIb4Jg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -19,14 +19,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2024.4.2";
|
||||
version = "2024.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-q4SVsfd5PJjeqt6UJJG6vuyxTA/bqDDl6e5dxhWIfYM=";
|
||||
hash = "sha256-LcRqqwMVDgXeUqBS7gmfZqGJxKmXgRfnjNbejlQgijI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fluent-bit";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nlBzD9u7DsCbJq9FxsbsP8F/tPklZ43NV8T2eiwWE24=";
|
||||
hash = "sha256-XMfUMyoI2mK0imvz/5HTO8CHyKubyPGSTN69v79fkjg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, perl, gd, rrdtool }:
|
||||
|
||||
let
|
||||
perlWithPkgs = perl.withPackages (pp: with pp;[
|
||||
Socket6
|
||||
IOSocketINET6
|
||||
]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mrtg";
|
||||
version = "2.17.10";
|
||||
@@ -10,7 +16,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
perl
|
||||
# add support for ipv6 snmp:
|
||||
# https://github.com/oetiker/mrtg/blob/433ebfa5fc043971b46a5cd975fb642c76e3e49d/src/bin/mrtg#L331-L341
|
||||
perlWithPkgs
|
||||
gd
|
||||
rrdtool
|
||||
];
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "dae";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0rc2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = "dae";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hvAuWCacaWxXwxx5ktj57hnWt8fcnwD6rUuRj1+ZtFA=";
|
||||
hash = "sha256-u+1DkcdXXm/wmKG7yu8nv3OOeG/l5KC+9UcIrYOmsUA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4U6zIxK8K+MGxRboTtsKntDMp8/cQWPqXQ3l03AEtBs=";
|
||||
vendorHash = "sha256-jJbXa3xnQXhEhrhmdi+JqdinLuRrFY5Tb9lsnCancFE=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user