Merge staging-next into staging
This commit is contained in:
commit
1e8752fccc
|
@ -26,10 +26,6 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
|
|||
{
|
||||
packageOverrides = pkgs: with pkgs; rec {
|
||||
myEmacsConfig = writeText "default.el" ''
|
||||
;; initialize package
|
||||
|
||||
(require 'package)
|
||||
(package-initialize 'noactivate)
|
||||
(eval-when-compile
|
||||
(require 'use-package))
|
||||
|
||||
|
@ -103,7 +99,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
|
|||
|
||||
This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.
|
||||
|
||||
Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`.
|
||||
Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to GNU-devel ELPA, and the highest for packages manually defined in `pkgs/applications/editors/emacs/elisp-packages/manual-packages`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`.
|
||||
|
||||
```nix
|
||||
overrides = self: super: rec {
|
||||
|
|
|
@ -286,11 +286,11 @@ The server should now be ready to serve Emacs clients.
|
|||
|
||||
### Starting the client {#module-services-emacs-starting-client}
|
||||
|
||||
Ensure that the emacs server is enabled, either by customizing the
|
||||
Ensure that the Emacs server is enabled, either by customizing the
|
||||
{var}`server-mode` variable, or by adding
|
||||
`(server-start)` to {file}`~/.emacs`.
|
||||
|
||||
To connect to the emacs daemon, run one of the following:
|
||||
To connect to the Emacs daemon, run one of the following:
|
||||
```
|
||||
emacsclient FILENAME
|
||||
emacsclient --create-frame # opens a new frame (window)
|
||||
|
@ -339,24 +339,10 @@ This will add the symlink
|
|||
|
||||
## Configuring Emacs {#module-services-emacs-configuring}
|
||||
|
||||
The Emacs init file should be changed to load the extension packages at
|
||||
startup:
|
||||
If you want to only use extension packages from Nixpkgs, you can add
|
||||
`(setq package-archives nil)` to your init file.
|
||||
|
||||
::: {.example #module-services-emacs-package-initialisation}
|
||||
### Package initialization in `.emacs`
|
||||
|
||||
```
|
||||
(require 'package)
|
||||
|
||||
;; optional. makes unpure packages archives unavailable
|
||||
(setq package-archives nil)
|
||||
|
||||
(setq package-enable-at-startup nil)
|
||||
(package-initialize)
|
||||
```
|
||||
:::
|
||||
|
||||
After the declarative emacs package configuration has been tested,
|
||||
After the declarative Emacs package configuration has been tested,
|
||||
previously downloaded packages can be cleaned up by removing
|
||||
{file}`~/.emacs.d/elpa` (do make a backup first, in case you
|
||||
forgot a package).
|
||||
|
|
|
@ -33,6 +33,15 @@ in
|
|||
Make sure that this file is readable by the exporter user.
|
||||
'';
|
||||
};
|
||||
tokenFile = mkOption {
|
||||
type = types.path;
|
||||
example = "/path/to/token-file";
|
||||
default = "";
|
||||
description = lib.mdDoc ''
|
||||
File containing the token for connecting to Nextcloud.
|
||||
Make sure that this file is readable by the exporter user.
|
||||
'';
|
||||
};
|
||||
timeout = mkOption {
|
||||
type = types.str;
|
||||
default = "5s";
|
||||
|
@ -47,12 +56,14 @@ in
|
|||
ExecStart = ''
|
||||
${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \
|
||||
--addr ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--username ${cfg.username} \
|
||||
--timeout ${cfg.timeout} \
|
||||
--server ${cfg.url} \
|
||||
--password ${escapeShellArg "@${cfg.passwordFile}"} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
${if cfg.tokenFile == "" then ''
|
||||
--username ${cfg.username} \
|
||||
--password ${escapeShellArg "@${cfg.passwordFile}"} \
|
||||
'' else ''
|
||||
--auth-token ${escapeShellArg "@${cfg.tokenFile}"} \
|
||||
''} ${concatStringsSep " \\\n " cfg.extraFlags}'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.17";
|
||||
version = "10.19";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
|
||||
sha256 = "sha256-yWoYeOGELXub/3kLC51SNPMC91u1aWAtdRsU6fRuX98=";
|
||||
sha256 = "sha256-kuK6Uok5PAK66OtY+Uu1R7g8T7geA9edn2Sv6LN2pXc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
repo = "felix";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3oXF9BG3BjGOeXqJHo3+fpcqcTOKrLED7Y3VQ06tnNA=";
|
||||
hash = "sha256-d01AbHAIelwjVnVX5hn4QY0sp9n9Ez4ImYqNO/RBmEU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2XMVappHbf1ZPtQO8zy8Z0n9wshDM4d30qkmG8OBoUY=";
|
||||
cargoHash = "sha256-n8cVdGvh3/lQ6pF0ukxsog+XpIdpjuxGcgkDkM/3IFk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xournalpp";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xournalpp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ=";
|
||||
sha256 = "sha256-dnFNGWPpK/eoW4Ib1E5w/kPy5okPxAja1v4rf0KpVKM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
mkDerivation, lib, kdepimTeam,
|
||||
extra-cmake-modules, kdoctools,
|
||||
akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
|
||||
kidentitymanagement, kio, kmailtransport,
|
||||
kidentitymanagement, kio, kmailtransport, messagelib
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
@ -14,7 +14,7 @@ mkDerivation {
|
|||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [
|
||||
akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
|
||||
kio kmailtransport
|
||||
kio kmailtransport messagelib
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
postInstall = ''
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, cmake
|
||||
, corrosion
|
||||
, extra-cmake-modules
|
||||
, futuresql
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kdbusaddons
|
||||
|
@ -13,6 +14,7 @@
|
|||
, knotifications
|
||||
, kpurpose
|
||||
, kwindowsystem
|
||||
, qcoro
|
||||
, qtfeedback
|
||||
, qtquickcontrols2
|
||||
, qqc2-desktop-style
|
||||
|
@ -22,7 +24,7 @@
|
|||
, srcs
|
||||
|
||||
# provided as callPackage input to enable easier overrides through overlays
|
||||
, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A="
|
||||
, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I="
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
@ -45,6 +47,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
futuresql
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kdbusaddons
|
||||
|
@ -54,6 +57,7 @@ mkDerivation rec {
|
|||
knotifications
|
||||
kpurpose
|
||||
kwindowsystem
|
||||
qcoro
|
||||
qtfeedback
|
||||
qtquickcontrols2
|
||||
qqc2-desktop-style
|
||||
|
|
|
@ -1,51 +1,52 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, baloo
|
||||
, kfilemetadata
|
||||
, kirigami2
|
||||
, kirigami-addons
|
||||
, kitemmodels
|
||||
, kquickcharts
|
||||
, plasma-framework
|
||||
, qqc2-desktop-style
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qtquickcontrols2
|
||||
, qtwebsockets
|
||||
, qtwebchannel
|
||||
, qtwebengine
|
||||
, qtwebsockets
|
||||
, baloo
|
||||
, karchive
|
||||
, kconfig
|
||||
, kcoreaddons
|
||||
, kdbusaddons
|
||||
, kfilemetadata
|
||||
, ki18n
|
||||
, kirigami-addons
|
||||
, kquickcharts
|
||||
, kwindowsystem
|
||||
, qqc2-desktop-style
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "arianna";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz";
|
||||
hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
baloo
|
||||
kfilemetadata
|
||||
kirigami2
|
||||
kirigami-addons
|
||||
kitemmodels
|
||||
kquickcharts
|
||||
plasma-framework
|
||||
qqc2-desktop-style
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtquickcontrols2
|
||||
qtwebsockets
|
||||
qtwebchannel
|
||||
qtwebengine
|
||||
qtwebsockets
|
||||
baloo
|
||||
karchive
|
||||
kconfig
|
||||
kcoreaddons
|
||||
kdbusaddons
|
||||
kfilemetadata
|
||||
ki18n
|
||||
kirigami-addons
|
||||
kquickcharts
|
||||
kwindowsystem
|
||||
qqc2-desktop-style
|
||||
];
|
||||
|
||||
meta = with lib; {
|
|
@ -4,12 +4,14 @@
|
|||
, extra-cmake-modules
|
||||
, wrapGAppsHook
|
||||
|
||||
, futuresql
|
||||
, gst_all_1
|
||||
, kcoreaddons
|
||||
, kcrash
|
||||
, ki18n
|
||||
, kirigami2
|
||||
, kirigami-addons
|
||||
, qcoro
|
||||
, qtimageformats
|
||||
, qtmultimedia
|
||||
, qtquickcontrols2
|
||||
|
@ -27,11 +29,13 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
futuresql
|
||||
kcoreaddons
|
||||
kcrash
|
||||
ki18n
|
||||
kirigami2
|
||||
kirigami-addons
|
||||
qcoro
|
||||
qtimageformats
|
||||
qtmultimedia
|
||||
qtquickcontrols2
|
||||
|
|
|
@ -93,12 +93,7 @@ mkDerivation {
|
|||
|
||||
qtWrapperArgs = [
|
||||
"--prefix PATH : ${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString withSage ''
|
||||
wrapProgram $out/share/cantor/sagebackend/cantor-execsage \
|
||||
--prefix PATH : ${sage-with-env}/bin
|
||||
'';
|
||||
] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Front end to powerful mathematics and statistics packages";
|
||||
|
|
|
@ -73,6 +73,7 @@ let
|
|||
akonadiconsole = callPackage ./akonadiconsole.nix {};
|
||||
akregator = callPackage ./akregator.nix {};
|
||||
analitza = callPackage ./analitza.nix {};
|
||||
arianna = callPackage ./arianna.nix {};
|
||||
ark = callPackage ./ark {};
|
||||
baloo-widgets = callPackage ./baloo-widgets.nix {};
|
||||
bomber = callPackage ./bomber.nix {};
|
||||
|
@ -99,7 +100,7 @@ let
|
|||
kaccounts-providers = callPackage ./kaccounts-providers.nix {};
|
||||
kaddressbook = callPackage ./kaddressbook.nix {};
|
||||
kalarm = callPackage ./kalarm.nix {};
|
||||
kalendar = callPackage ./kalendar.nix {};
|
||||
merkuro = callPackage ./merkuro.nix {};
|
||||
kalzium = callPackage ./kalzium.nix {};
|
||||
kamoso = callPackage ./kamoso.nix {};
|
||||
kapman = callPackage ./kapman.nix {};
|
||||
|
@ -134,7 +135,6 @@ let
|
|||
kdiamond = callPackage ./kdiamond.nix {};
|
||||
keditbookmarks = callPackage ./keditbookmarks.nix {};
|
||||
kfind = callPackage ./kfind.nix {};
|
||||
kfloppy = callPackage ./kfloppy.nix {};
|
||||
kgeography = callPackage ./kgeography.nix {};
|
||||
kget = callPackage ./kget.nix {};
|
||||
kgpg = callPackage ./kgpg.nix {};
|
||||
|
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.0/src -A '*.tar.xz' )
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
, knotifyconfig
|
||||
, kplotting
|
||||
, ktextwidgets
|
||||
, mediainfo
|
||||
, mlt
|
||||
, shared-mime-info
|
||||
, libv4l
|
||||
|
@ -58,6 +59,7 @@ mkDerivation {
|
|||
knotifyconfig
|
||||
kplotting
|
||||
ktextwidgets
|
||||
mediainfo
|
||||
mlt
|
||||
phonon-backend-gstreamer
|
||||
qtdeclarative
|
||||
|
@ -77,9 +79,11 @@ mkDerivation {
|
|||
# Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
|
||||
# doesn't find them. See:
|
||||
# https://github.com/NixOS/nixpkgs/issues/83885
|
||||
patches = [ ./mlt-path.patch ./ffmpeg-path.patch ];
|
||||
inherit mlt;
|
||||
patches = [ ./dependency-paths.patch ];
|
||||
|
||||
inherit mlt mediainfo;
|
||||
ffmpeg = ffmpeg-full;
|
||||
|
||||
postPatch =
|
||||
# Module Qt5::Concurrent must be included in `find_package` before it is used.
|
||||
''
|
||||
|
|
46
pkgs/applications/kde/kdenlive/dependency-paths.patch
Normal file
46
pkgs/applications/kde/kdenlive/dependency-paths.patch
Normal file
|
@ -0,0 +1,46 @@
|
|||
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
|
||||
index 029849e5f..8befe4888 100644
|
||||
--- a/src/kdenlivesettings.kcfg
|
||||
+++ b/src/kdenlivesettings.kcfg
|
||||
@@ -517,7 +517,7 @@
|
||||
<group name="env">
|
||||
<entry name="mltpath" type="Path">
|
||||
<label>Mlt framework install path.</label>
|
||||
- <default></default>
|
||||
+ <default>@mlt@/share/mlt/profiles</default>
|
||||
</entry>
|
||||
|
||||
<entry name="kdenliverendererpath" type="Path">
|
||||
@@ -527,27 +527,27 @@
|
||||
|
||||
<entry name="meltpath" type="Path">
|
||||
<label>Mlt melt renderer install path.</label>
|
||||
- <default></default>
|
||||
+ <default>@mlt@/bin/melt</default>
|
||||
</entry>
|
||||
|
||||
<entry name="ffmpegpath" type="Path">
|
||||
<label>FFmpeg / Libav binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@ffmpeg@/bin/ffmpeg</default>
|
||||
</entry>
|
||||
|
||||
<entry name="ffplaypath" type="Path">
|
||||
<label>FFplay / avplay binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@ffmpeg@/bin/ffplay</default>
|
||||
</entry>
|
||||
|
||||
<entry name="ffprobepath" type="Path">
|
||||
<label>FFprobe / avprobe binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@ffmpeg@/bin/ffprobe</default>
|
||||
</entry>
|
||||
|
||||
<entry name="mediainfopath" type="Path">
|
||||
<label>mediaInfo binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@mediainfo@/bin/mediainfo</default>
|
||||
</entry>
|
||||
|
||||
<entry name="processingthreads" type="Int">
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
|
||||
index 5edad5ae7..d35347a40 100644
|
||||
--- a/src/kdenlivesettings.kcfg
|
||||
+++ b/src/kdenlivesettings.kcfg
|
||||
@@ -403,17 +403,17 @@
|
||||
|
||||
<entry name="ffmpegpath" type="Path">
|
||||
<label>FFmpeg / Libav binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@ffmpeg@/bin/ffmpeg</default>
|
||||
</entry>
|
||||
|
||||
<entry name="ffplaypath" type="Path">
|
||||
<label>FFplay / avplay binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@ffmpeg@/bin/ffplay</default>
|
||||
</entry>
|
||||
|
||||
<entry name="ffprobepath" type="Path">
|
||||
<label>FFprobe / avprobe binary path.</label>
|
||||
- <default></default>
|
||||
+ <default>@ffmpeg@/bin/ffprobe</default>
|
||||
</entry>
|
||||
|
||||
<entry name="mltthreads" type="Int">
|
|
@ -1,22 +0,0 @@
|
|||
diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
|
||||
--- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400
|
||||
+++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400
|
||||
@@ -378,14 +378,14 @@
|
||||
</group>
|
||||
|
||||
<group name="env">
|
||||
- <entry name="mltpath" type="Path">
|
||||
+ <entry name="mltpath" type="Path" hidden="true">
|
||||
<label>Mlt framework install path.</label>
|
||||
- <default></default>
|
||||
+ <default>@mlt@/share/mlt/profiles</default>
|
||||
</entry>
|
||||
|
||||
- <entry name="rendererpath" type="Path">
|
||||
+ <entry name="rendererpath" type="Path" hidden="true">
|
||||
<label>Mlt melt renderer install path.</label>
|
||||
- <default></default>
|
||||
+ <default>@mlt@/bin/melt</default>
|
||||
</entry>
|
||||
|
||||
<entry name="ffmpegpath" type="Path">
|
|
@ -1,20 +0,0 @@
|
|||
{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kfloppy";
|
||||
meta = with lib; {
|
||||
homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy";
|
||||
description = "Utility to format 3.5\" and 5.25\" floppy disks";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
kdoctools
|
||||
kcompletion
|
||||
kxmlgui
|
||||
];
|
||||
}
|
|
@ -41,8 +41,8 @@
|
|||
, messagelib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kalendar";
|
||||
mkDerivation {
|
||||
pname = "merkuro";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
@ -89,14 +89,11 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ];
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/kalendar" \
|
||||
--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"
|
||||
'';
|
||||
qtWrapperArgs = [''--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"''];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
|
||||
homepage = "https://apps.kde.org/kalendar/";
|
||||
homepage = "https://invent.kde.org/pim/merkuro";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ Thra11 ];
|
||||
platforms = platforms.linux;
|
|
@ -1,6 +1,5 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchpatch
|
||||
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
|
@ -33,14 +32,6 @@
|
|||
mkDerivation {
|
||||
pname = "neochat";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "libquotient-0.8.patch";
|
||||
url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch";
|
||||
hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, extra-cmake-modules
|
||||
, kirigami2
|
||||
, ktextwidgets
|
||||
, libksane
|
||||
, qtquickcontrols2
|
||||
, kpurpose
|
||||
, kquickimageedit
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "skanpage";
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
@ -20,13 +20,13 @@ mkDerivation rec {
|
|||
libksane
|
||||
qtquickcontrols2
|
||||
kpurpose
|
||||
kquickimageedit
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "KDE utility to scan images and multi-page documents";
|
||||
homepage = "https://apps.kde.org/skanpage";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,21 +5,12 @@
|
|||
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
|
||||
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
|
||||
, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
|
||||
, wrapGAppsHook, fetchpatch
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "spectacle";
|
||||
|
||||
patches = [
|
||||
# backport fix for region capture with multi-display high-dpi setups
|
||||
# FIXME: remove in 23.08
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch";
|
||||
hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -20,6 +20,7 @@
|
|||
, qtwebsockets
|
||||
, kitemmodels
|
||||
, pimcommon
|
||||
, mpv
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
|
@ -47,6 +48,7 @@ mkDerivation {
|
|||
qtwebsockets
|
||||
kitemmodels
|
||||
pimcommon
|
||||
mpv
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -8,10 +8,10 @@ buildGoModule rec {
|
|||
owner = "tulir";
|
||||
repo = "gopacked";
|
||||
rev = "v${version}";
|
||||
sha256 = "03qr8rlnipziy16nbcpf631jh42gsyv2frdnh8yzsh8lm0p8p4ry";
|
||||
hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352";
|
||||
vendorHash = "sha256-ooxVXNbqoh3XX3yFemAyqISNZ+PC8WJUe+ch2OnIdDo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mainsail";
|
||||
version = "2.6.2";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
|
||||
hash = "sha256-/ej26rLze/QaxGDtU4XhaejlkbkzZfzB+ib2I+3W8Ho=";
|
||||
hash = "sha256-j2ri7PyQGzRlhpgE9qKneX00HwlDmIi2JUremz446wk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
@ -34,11 +34,6 @@ mkDerivation rec {
|
|||
hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/gui/imagewidget.h \
|
||||
--replace ksane_version.h KF5/ksane_version.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.28";
|
||||
ptb = "0.0.44";
|
||||
ptb = "0.0.45";
|
||||
canary = "0.0.166";
|
||||
development = "0.0.217";
|
||||
} else {
|
||||
|
@ -20,7 +20,7 @@ let
|
|||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA=";
|
||||
sha256 = "cN70ZYl9hxWU5FSCpDbpOuR2Wsz6XtPSDoXOTvcCe7g=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
assert withQt -> qt6 != null;
|
||||
|
||||
let
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
@ -61,7 +61,7 @@ stdenv.mkDerivation {
|
|||
repo = "wireshark";
|
||||
owner = "wireshark";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CjSf4CfzgiXvmraM3lYBVLSfdDBSuFNIgeatj0OjYSQ=";
|
||||
hash = "sha256-bNg0yhNb1GRsTclNWWO+Bamm2wOnUjVKU+JftJu+LTo=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Fbi+vZEyXhUZQjWUX01IXd6G1cthfiuztdbisNQ/VZU=";
|
||||
sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ];
|
||||
buildInputs = [ libqalculate gtk3 ];
|
||||
buildInputs = [ libqalculate gtk3 curl ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-qt";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fMchJgxuOO2e7cOHLako26c9gsWvQY2MTRVD3JWGSAU=";
|
||||
hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];
|
||||
|
|
|
@ -11,18 +11,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno=";
|
||||
hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib libseccomp systemd ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
|
||||
|
||||
# manpage requires building the vendored go-md2man
|
||||
makeFlags = [ "bin/conmon" ];
|
||||
|
|
|
@ -1,31 +1,21 @@
|
|||
{ lib, rustPlatform, fetchgit, fetchpatch
|
||||
, pkg-config, protobuf, python3, wayland-scanner
|
||||
{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner
|
||||
, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "115.2";
|
||||
version = "116.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "d14053a211eb6753c53ced71fad2d3b402b997e6";
|
||||
sha256 = "8p6M9Q9E07zqtHYdIIi6io9LLatd+9fH4Inod2Xjy5M=";
|
||||
rev = "97ac6ce38d8e5789c91fcc5bae6078d21a2afdb3";
|
||||
sha256 = "NssjHXorPGZBYqERPeLW3cqEzbXqyL9N4OnLLQMLALk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport option to not vendor virglrenderer.
|
||||
(fetchpatch {
|
||||
url = "https://chromium.googlesource.com/crosvm/crosvm/+/dde9aa0e6d89a090f5d5f000822f7911eba98445%5E%21/?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
hash = "sha256-W/s1i2reBXsbr0AOEtL9go3TNNYMwDVEu6pz3Q9wBSU=";
|
||||
})
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoSha256 = "ZXyMeu2forItGcsGrNBWhV1V9HzVQK6LM4TxBrxAZnU=";
|
||||
cargoHash = "sha256-mlXAlq62nAW6ZVxRav+k/iU1YDecfPDTCPp7FdJBO54=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "katriawm";
|
||||
version = "23.04";
|
||||
version = "23.06";
|
||||
|
||||
src = fetchzip {
|
||||
name = finalAttrs.pname + "-" + finalAttrs.version;
|
||||
url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Wi9Fv/Ms6t7tr8nxznXrn/6V04lnO1HMz4XFbuCr9+Y=";
|
||||
hash = "sha256-4vdBX5biakoxiOyz7DPNgkLxlzi27kZ9rC20g+pn3N4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-appfinder";
|
||||
version = "4.18.0";
|
||||
version = "4.18.1";
|
||||
|
||||
sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw=";
|
||||
sha256 = "sha256-CZEX1PzFsVt72Fkb4+5PiZjAcDisvYnbzFGFXjFL4sc=";
|
||||
|
||||
nativeBuildInputs = [ exo ];
|
||||
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
|
||||
|
|
16
pkgs/development/libraries/futuresql/default.nix
Normal file
16
pkgs/development/libraries/futuresql/default.nix
Normal file
|
@ -0,0 +1,16 @@
|
|||
{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "futuresql";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
# a library, nothing to wrap
|
||||
dontWrapQtApps = true;
|
||||
}
|
|
@ -1,13 +1,21 @@
|
|||
{ lib, stdenv, fetchzip, pugixml, updfparser, curl, openssl, libzip
|
||||
, installShellFiles }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, pugixml
|
||||
, updfparser
|
||||
, curl
|
||||
, openssl
|
||||
, libzip
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgourou";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/";
|
||||
sha256 = "sha256-X56K4z1+k62Q9pxnN8kx35oc7+uJJN/o/tpnKx1FjwE=";
|
||||
sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU=";
|
||||
sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
@ -26,24 +26,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openturns";
|
||||
version = "1.20";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openturns";
|
||||
repo = "openturns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A=";
|
||||
sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187
|
||||
# Remove with next version update.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch";
|
||||
hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx;
|
||||
buildInputs = [
|
||||
swig
|
||||
|
@ -84,6 +75,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Multivariate probabilistic modeling and uncertainty treatment library";
|
||||
license = with licenses; [ lgpl3 gpl3 ];
|
||||
homepage = "https://openturns.github.io/www/";
|
||||
changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog";
|
||||
maintainers = with maintainers; [ gdinh ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
@ -14,8 +14,6 @@
|
|||
, python3
|
||||
, which
|
||||
, nodejs
|
||||
, qtbase
|
||||
, perl
|
||||
, xorg
|
||||
, libXcursor
|
||||
, libXScrnSaver
|
||||
|
@ -51,8 +49,6 @@
|
|||
, systemd
|
||||
, pipewire
|
||||
, gn
|
||||
, runCommand
|
||||
, writeScriptBin
|
||||
, ffmpeg_4
|
||||
, lib
|
||||
, stdenv
|
||||
|
@ -60,10 +56,8 @@
|
|||
, libxml2
|
||||
, libxslt
|
||||
, lcms2
|
||||
, re2
|
||||
, libkrb5
|
||||
, mesa
|
||||
, xkeyboard_config
|
||||
, enableProprietaryCodecs ? true
|
||||
# darwin
|
||||
, llvmPackages_14
|
||||
|
@ -229,7 +223,6 @@ qtModule {
|
|||
libxml2
|
||||
libxslt
|
||||
lcms2
|
||||
re2
|
||||
|
||||
libevent
|
||||
ffmpeg_4
|
||||
|
|
|
@ -1,52 +1,43 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, fetchPypi
|
||||
, openssl
|
||||
, pylsqpack
|
||||
, certifi
|
||||
, pytestCheckHook
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioquic";
|
||||
version = "0.9.20";
|
||||
version = "0.9.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74=";
|
||||
hash = "sha256-ecfsBjGOeFYnZlyk6HI63zR7ciW30AbjMtJXWh9RbvU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch is here because it's required by the next patch.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch";
|
||||
hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag=";
|
||||
})
|
||||
# https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch";
|
||||
hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY=";
|
||||
})
|
||||
# AssertionError: 'self-signed certificate' != 'self signed certificate'
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/cfcd3ce12fb27f5b26deb011a82f66b5d68d521a.patch";
|
||||
hash = "sha256-bCW817Z7jCxYySfUukNR4cibURH3qZWEQjeeyvRIqZY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
pylsqpack
|
||||
pyopenssl
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioquic" ];
|
||||
pythonImportsCheck = [
|
||||
"aioquic"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncsleepiq";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag=";
|
||||
hash = "sha256-h+Q9g0kznGMLLi8i/iKodGXB+f/m3PXoF6h6hhIX9ys=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmetrics-api-client";
|
||||
version = "2023.8.10.19";
|
||||
version = "2023.8.24.13";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "coinmetrics_api_client";
|
||||
hash = "sha256-sXWcnl6E2Aw78Y4JPpTQlRmhRP6egl6eo81N2PIhi34=";
|
||||
hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
@ -1,17 +1,41 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Events";
|
||||
version = "0.4";
|
||||
pname = "events";
|
||||
version = "0.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyeve";
|
||||
repo = "events";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"events"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"events/tests/tests.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://events.readthedocs.org";
|
||||
description = "Bringing the elegance of C# EventHanlder to Python";
|
||||
homepage = "https://events.readthedocs.org";
|
||||
changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "exchangelib";
|
||||
version = "5.0.3";
|
||||
version = "5.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
|||
owner = "ecederstrand";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oQ09/CvHIA4PAVqK6DeY3slHvQ1aPRqCC6ZuhubTN94=";
|
||||
hash = "sha256-WKQgfmEbil55WO3tWVq4n9wiJNw0Op/jbI7xt5vtKpA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.8.9";
|
||||
version = "2023.8.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PQ9KxKyTa9xiLa6suqHRem6Rs732djbjzFKKLZDUM/g=";
|
||||
hash = "sha256-Piy/yUIK+IuEVbkkB18Z1iGNcE67eowff3IimI43E+s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ical";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "allenporter";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo=";
|
||||
hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bleak
|
||||
, pyyaml
|
||||
, voluptuous
|
||||
|
@ -13,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "idasen";
|
||||
version = "0.9.6";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,17 +21,9 @@ buildPythonPackage rec {
|
|||
owner = "newAM";
|
||||
repo = "idasen";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk=";
|
||||
hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "replace-poetry-with-poetry-core.patch";
|
||||
url = "https://github.com/newAM/idasen/commit/b9351d5c9def0687e4ae4cb65f38d14ed9ff2df5.patch";
|
||||
hash = "sha256-Qi3psPZExJ5tBJ4IIvDC3JnWf4Gym6Z7akGCV8GZUNY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{ lib
|
||||
, argon2-cffi
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, argon2-cffi
|
||||
, keyring
|
||||
, pycryptodome
|
||||
, pytestCheckHook
|
||||
|
@ -10,26 +9,22 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "keyrings.cryptfile";
|
||||
# NOTE: newer releases are bugged/incompatible
|
||||
# https://github.com/frispete/keyrings.cryptfile/issues/15
|
||||
version = "1.3.4";
|
||||
pname = "keyrings-cryptfile";
|
||||
version = "1.3.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c=";
|
||||
pname = "keyrings.cryptfile";
|
||||
inherit version;
|
||||
hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upstream setup.cfg has an option that is not supported
|
||||
./fix-testsuite.patch
|
||||
# change of API in keyrings.testing
|
||||
(fetchpatch {
|
||||
url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch";
|
||||
hash = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "-s --cov=keyrings/cryptfile" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
argon2-cffi
|
||||
|
@ -46,13 +41,14 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_set_properties"
|
||||
"UncryptedFileKeyringTestCase"
|
||||
# FileNotFoundError: [Errno 2] No such file or directory: '/build/...
|
||||
"test_versions"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Encrypted file keyring backend";
|
||||
homepage = "https://github.com/frispete/keyrings.cryptfile";
|
||||
changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.chia.members;
|
||||
};
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.110.1";
|
||||
version = "2.110.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v2h/K1gat+nHGjn6a9r1BDMDAoJ/OtNctxHzV41gRkg=";
|
||||
hash = "sha256-4+qP/eCd3xy0Q3Nrwbj2VpyNWqiKL82nrX7Od0yHToo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.143";
|
||||
version = "2.1.144";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xyYD9oGrlK1kswQ7uiO3/gAJUnelvWv7ZHyzn/g5iCg=";
|
||||
hash = "sha256-wugHG/ZfyfNgd2znDS7FXu34LsUVMcwDswFkh4lRIXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k
|
||||
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2
|
||||
, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml
|
||||
, pytestCheckHook
|
||||
, pytestCheckHook, setuptools
|
||||
}@args:
|
||||
|
||||
import ../pillow/generic.nix (rec {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, fetchpatch
|
||||
, isPyPy
|
||||
, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11
|
||||
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
|
||||
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools
|
||||
# for passthru.tests
|
||||
, imageio, matplotlib, pilkit, pydicom, reportlab
|
||||
}@args:
|
||||
|
|
|
@ -39,6 +39,8 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [ pytestCheckHook pyroma numpy ];
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ]
|
||||
++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
|
||||
++ lib.optionals (isPyPy) [ tk libX11 ];
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1FSu5ejFjjNTuvaFU/UqAI/817HkrOA1Hczq8gcPQGA=";
|
||||
hash = "sha256-hh2sfWOUp3ac75NEuTrw3YkvS7hXpzJp39v6cfrhNiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -25,13 +25,14 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "AustinBrunkhorst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \
|
||||
--replace 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \
|
||||
--replace 'Events = "^0.4"' 'Events = ">=0.4"' \
|
||||
--replace " --cov=pysnooz --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
|
@ -62,6 +63,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library to control SNOOZ white noise machines";
|
||||
homepage = "https://github.com/AustinBrunkhorst/pysnooz";
|
||||
changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spdx-tools";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "spdx";
|
||||
repo = "tools-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM=";
|
||||
hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-utils";
|
||||
version = "3.34";
|
||||
version = "3.35";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM=";
|
||||
hash = "sha256-j2/n+NEncs1c9FlHA6mNzQw3wP1oIN0gVBunS5/KNjo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -42,20 +42,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "strawberry-graphql";
|
||||
version = "0.185.1";
|
||||
version = "0.205.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strawberry-graphql";
|
||||
repo = "strawberry";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PwhTD1k2GOVf6ACNDY1atLLP1jjAF6eTDCE3eLUIpJA=";
|
||||
hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/strawberry-graphql/strawberry/pull/2199
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch";
|
||||
hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y=";
|
||||
|
@ -64,7 +65,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --emoji --mypy-ini-file=mypy.ini --benchmark-disable" "" \
|
||||
--replace "--emoji --mypy-ini-file=mypy.ini" "" \
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,18 +1,16 @@
|
|||
{ lib
|
||||
, awacs
|
||||
, buildPythonPackage
|
||||
, cfn-flip
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, python
|
||||
|
||||
# python dependencies
|
||||
, awacs
|
||||
, cfn-flip
|
||||
, typing-extensions
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "troposphere";
|
||||
version = "4.3.2";
|
||||
version = "4.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,34 +19,35 @@ buildPythonPackage rec {
|
|||
owner = "cloudtools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8vIpwZBUdU9gD1Ya0+L1phMDMcAABtuyRx4quDfQWGA=";
|
||||
hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cfn-flip
|
||||
] ++ lib.lists.optionals (pythonOlder "3.8") [
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
awacs
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
policy = [ awacs ];
|
||||
policy = [
|
||||
awacs
|
||||
];
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "troposphere" ];
|
||||
pythonImportsCheck = [
|
||||
"troposphere"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to create AWS CloudFormation descriptions";
|
||||
maintainers = with maintainers; [ jlesquembre ];
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://github.com/cloudtools/troposphere";
|
||||
changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ jlesquembre ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.20.0";
|
||||
version = "10.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0NUOOJu3iuKBlIi4z1Jv8e00BTsgk0dpLOgfpIKSc2A=";
|
||||
sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
maintainers = with maintainers; [ colemickens kashw2 ];
|
||||
license = licenses.mit;
|
||||
description = "The new Azure Storage data transfer utility - AzCopy v10";
|
||||
};
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.31.3";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-oSjfNbId5jEHeLiJ3FMoNqwLZg6iyr3ZqpcfKvEnpac=";
|
||||
hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VHHEQafQfRqmdscuWpN+NdcfEc1sTt+lKLg26aM9QQE=";
|
||||
cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -1,20 +1,24 @@
|
|||
{ buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, lib
|
||||
, substituteAll
|
||||
, esbuild
|
||||
, buildGoModule
|
||||
, buildWebExtension ? false
|
||||
}:
|
||||
let
|
||||
version = "1.4.5";
|
||||
gitHash = "98a03c8";
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "vencord";
|
||||
version = "1.3.4";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r+VgxXwsBOfMggcVlr5q1/ONfp13CpX4ssrLQtmdLe8=";
|
||||
sha256 = "sha256-ZoHOCl0j+RBSl2lL9wO2rJ8VR+GNIeWJYe65c3lVoz8=";
|
||||
};
|
||||
|
||||
ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
|
||||
|
@ -33,23 +37,36 @@ buildNpmPackage rec {
|
|||
# Supresses an error about esbuild's version.
|
||||
npmRebuildFlags = [ "|| true" ];
|
||||
|
||||
npmDepsHash = "sha256-HJK88z4Gs8mqd28zKrsTtk34VcRqIyb6aURbvRZLN0I=";
|
||||
npmDepsHash = "sha256-51IK95QY9YX0WerGu4GuOrYKoj8Uoo0R1b6WZpC5v4U=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
|
||||
npmBuildFlags = [ "--" "--standalone" ];
|
||||
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
|
||||
|
||||
prePatch = ''
|
||||
cp ${./package-lock.json} ./package-lock.json
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./replace-git.patch;
|
||||
inherit version;
|
||||
(fetchpatch2 {
|
||||
name = "allow-git-hash-remote-preset.patch";
|
||||
url = "https://github.com/Vendicated/Vencord/commit/d9f55664428007199348123b05818f9e08c4f64d.patch";
|
||||
hash = "sha256-l4PP8nVtyQJYUqtU9xYGT4j1Oayy08DE6TfbwPun0pY=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "use-source-date-epoch.patch";
|
||||
url = "https://github.com/Vendicated/Vencord/commit/28247c88a949eeaac75b13a8d6653164d9659f56.patch";
|
||||
hash = "sha256-mMpsB3GkI9LUiMQ/NFOiRw4z+wVkktmWgUHNTgxUFPU=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
name = "allow-disabling-updater.patch";
|
||||
url = "https://github.com/Vendicated/Vencord/commit/bad1fa0c766b2d42cd2eb0e0d1ab2e0c381bab98.patch";
|
||||
hash = "sha256-yp453kFvVC02QEB3Op8PfopnLt3xGkjp4WfP6kPeIJ0=";
|
||||
})
|
||||
./disable-updater-ui.patch
|
||||
];
|
||||
|
||||
VENCORD_HASH = gitHash;
|
||||
VENCORD_REMOTE = "${src.owner}/${src.repo}";
|
||||
|
||||
installPhase =
|
||||
if buildWebExtension then ''
|
||||
cp -r dist/chromium-unpacked/ $out
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
|
||||
index 4d0b86c..0f1d87f 100644
|
||||
--- a/src/components/VencordSettings/UpdaterTab.tsx
|
||||
+++ b/src/components/VencordSettings/UpdaterTab.tsx
|
||||
@@ -249,4 +249,4 @@ function Updater() {
|
||||
);
|
||||
}
|
||||
|
||||
-export default IS_WEB ? null : wrapTab(Updater, "Updater");
|
||||
+export default null;
|
||||
diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
|
||||
index 3ea5a43..da63213 100644
|
||||
--- a/src/plugins/_core/settings.tsx
|
||||
+++ b/src/plugins/_core/settings.tsx
|
||||
@@ -105,7 +105,7 @@ export default definePlugin({
|
||||
label: "Themes",
|
||||
element: require("@components/VencordSettings/ThemesTab").default,
|
||||
},
|
||||
- !IS_WEB && {
|
||||
+ false && !IS_WEB && {
|
||||
section: "VencordUpdater",
|
||||
label: "Updater",
|
||||
element: require("@components/VencordSettings/UpdaterTab").default,
|
||||
diff --git a/src/utils/updater.ts b/src/utils/updater.ts
|
||||
index 2e2bfe1..5ebd06e 100644
|
||||
--- a/src/utils/updater.ts
|
||||
+++ b/src/utils/updater.ts
|
||||
@@ -38,6 +38,7 @@ async function Unwrap<T>(p: Promise<IpcRes<T>>) {
|
||||
}
|
||||
|
||||
export async function checkForUpdates() {
|
||||
+ return false;
|
||||
changes = await Unwrap(VencordNative.updater.getUpdates());
|
||||
if (changes.some(c => c.hash === gitHash)) {
|
||||
isNewer = true;
|
134
pkgs/misc/vencord/package-lock.json
generated
134
pkgs/misc/vencord/package-lock.json
generated
|
@ -1,16 +1,18 @@
|
|||
{
|
||||
"name": "vencord",
|
||||
"version": "1.3.4",
|
||||
"version": "1.4.5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "vencord",
|
||||
"version": "1.3.4",
|
||||
"license": "GPL-3.0",
|
||||
"version": "1.4.5",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@sapphi-red/web-noise-suppressor": "0.3.3",
|
||||
"@vap/core": "0.0.12",
|
||||
"@vap/shiki": "0.10.5",
|
||||
"eslint-plugin-simple-header": "^1.0.2",
|
||||
"fflate": "^0.7.4",
|
||||
"nanoid": "^4.0.2",
|
||||
"virtual-merge": "^1.0.1"
|
||||
|
@ -27,9 +29,8 @@
|
|||
"diff": "^5.1.0",
|
||||
"discord-types": "^1.3.26",
|
||||
"esbuild": "^0.15.18",
|
||||
"eslint": "^8.28.0",
|
||||
"eslint": "^8.46.0",
|
||||
"eslint-import-resolver-alias": "^1.1.2",
|
||||
"eslint-plugin-header": "^3.1.1",
|
||||
"eslint-plugin-path-alias": "^1.0.0",
|
||||
"eslint-plugin-simple-import-sort": "^10.0.0",
|
||||
"eslint-plugin-unused-imports": "^2.0.0",
|
||||
|
@ -48,6 +49,15 @@
|
|||
"pnpm": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/@aashutoshrathi/word-wrap": {
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
|
||||
"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/code-frame": {
|
||||
"version": "7.22.5",
|
||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
|
||||
|
@ -695,23 +705,23 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@eslint-community/regexpp": {
|
||||
"version": "4.5.1",
|
||||
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
|
||||
"integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
|
||||
"version": "4.6.2",
|
||||
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
|
||||
"integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@eslint/eslintrc": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
|
||||
"integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
|
||||
"integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ajv": "^6.12.4",
|
||||
"debug": "^4.3.2",
|
||||
"espree": "^9.5.2",
|
||||
"espree": "^9.6.0",
|
||||
"globals": "^13.19.0",
|
||||
"ignore": "^5.2.0",
|
||||
"import-fresh": "^3.2.1",
|
||||
|
@ -727,9 +737,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@eslint/js": {
|
||||
"version": "8.43.0",
|
||||
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
|
||||
"integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
|
||||
"version": "8.47.0",
|
||||
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
|
||||
"integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
|
||||
|
@ -833,6 +843,11 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"node_modules/@sapphi-red/web-noise-suppressor": {
|
||||
"version": "0.3.3",
|
||||
"resolved": "https://registry.npmjs.org/@sapphi-red/web-noise-suppressor/-/web-noise-suppressor-0.3.3.tgz",
|
||||
"integrity": "sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw=="
|
||||
},
|
||||
"node_modules/@types/diff": {
|
||||
"version": "5.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.3.tgz",
|
||||
|
@ -1133,9 +1148,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/acorn": {
|
||||
"version": "8.9.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
|
||||
"integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
|
||||
"version": "8.10.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
|
||||
"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"acorn": "bin/acorn"
|
||||
|
@ -2295,27 +2310,27 @@
|
|||
}
|
||||
},
|
||||
"node_modules/eslint": {
|
||||
"version": "8.43.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
|
||||
"integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
|
||||
"version": "8.47.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
|
||||
"integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@eslint-community/eslint-utils": "^4.2.0",
|
||||
"@eslint-community/regexpp": "^4.4.0",
|
||||
"@eslint/eslintrc": "^2.0.3",
|
||||
"@eslint/js": "8.43.0",
|
||||
"@eslint-community/regexpp": "^4.6.1",
|
||||
"@eslint/eslintrc": "^2.1.2",
|
||||
"@eslint/js": "^8.47.0",
|
||||
"@humanwhocodes/config-array": "^0.11.10",
|
||||
"@humanwhocodes/module-importer": "^1.0.1",
|
||||
"@nodelib/fs.walk": "^1.2.8",
|
||||
"ajv": "^6.10.0",
|
||||
"ajv": "^6.12.4",
|
||||
"chalk": "^4.0.0",
|
||||
"cross-spawn": "^7.0.2",
|
||||
"debug": "^4.3.2",
|
||||
"doctrine": "^3.0.0",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"eslint-scope": "^7.2.0",
|
||||
"eslint-visitor-keys": "^3.4.1",
|
||||
"espree": "^9.5.2",
|
||||
"eslint-scope": "^7.2.2",
|
||||
"eslint-visitor-keys": "^3.4.3",
|
||||
"espree": "^9.6.1",
|
||||
"esquery": "^1.4.2",
|
||||
"esutils": "^2.0.2",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
|
@ -2325,7 +2340,6 @@
|
|||
"globals": "^13.19.0",
|
||||
"graphemer": "^1.4.0",
|
||||
"ignore": "^5.2.0",
|
||||
"import-fresh": "^3.0.0",
|
||||
"imurmurhash": "^0.1.4",
|
||||
"is-glob": "^4.0.0",
|
||||
"is-path-inside": "^3.0.3",
|
||||
|
@ -2335,9 +2349,8 @@
|
|||
"lodash.merge": "^4.6.2",
|
||||
"minimatch": "^3.1.2",
|
||||
"natural-compare": "^1.4.0",
|
||||
"optionator": "^0.9.1",
|
||||
"optionator": "^0.9.3",
|
||||
"strip-ansi": "^6.0.1",
|
||||
"strip-json-comments": "^3.1.0",
|
||||
"text-table": "^0.2.0"
|
||||
},
|
||||
"bin": {
|
||||
|
@ -2362,15 +2375,6 @@
|
|||
"eslint-plugin-import": ">=1.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-plugin-header": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
|
||||
"integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
|
||||
"dev": true,
|
||||
"peerDependencies": {
|
||||
"eslint": ">=7.7.0"
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-plugin-path-alias": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz",
|
||||
|
@ -2383,6 +2387,11 @@
|
|||
"eslint": "^7"
|
||||
}
|
||||
},
|
||||
"node_modules/eslint-plugin-simple-header": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.0.2.tgz",
|
||||
"integrity": "sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA=="
|
||||
},
|
||||
"node_modules/eslint-plugin-simple-import-sort": {
|
||||
"version": "10.0.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz",
|
||||
|
@ -2436,9 +2445,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/eslint-visitor-keys": {
|
||||
"version": "3.4.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
|
||||
"integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
|
||||
"version": "3.4.3",
|
||||
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
|
||||
"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
|
||||
|
@ -2448,9 +2457,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/eslint/node_modules/eslint-scope": {
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
|
||||
"integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
|
||||
"version": "7.2.2",
|
||||
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
|
||||
"integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"esrecurse": "^4.3.0",
|
||||
|
@ -2473,12 +2482,12 @@
|
|||
}
|
||||
},
|
||||
"node_modules/espree": {
|
||||
"version": "9.5.2",
|
||||
"resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
|
||||
"integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
|
||||
"version": "9.6.1",
|
||||
"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
|
||||
"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"acorn": "^8.8.0",
|
||||
"acorn": "^8.9.0",
|
||||
"acorn-jsx": "^5.3.2",
|
||||
"eslint-visitor-keys": "^3.4.1"
|
||||
},
|
||||
|
@ -2893,9 +2902,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/globals": {
|
||||
"version": "13.20.0",
|
||||
"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
|
||||
"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
|
||||
"version": "13.21.0",
|
||||
"resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
|
||||
"integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"type-fest": "^0.20.2"
|
||||
|
@ -3866,17 +3875,17 @@
|
|||
}
|
||||
},
|
||||
"node_modules/optionator": {
|
||||
"version": "0.9.1",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
|
||||
"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
|
||||
"version": "0.9.3",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
|
||||
"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@aashutoshrathi/word-wrap": "^1.2.3",
|
||||
"deep-is": "^0.1.3",
|
||||
"fast-levenshtein": "^2.0.6",
|
||||
"levn": "^0.4.1",
|
||||
"prelude-ls": "^1.2.1",
|
||||
"type-check": "^0.4.0",
|
||||
"word-wrap": "^1.2.3"
|
||||
"type-check": "^0.4.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.8.0"
|
||||
|
@ -5600,15 +5609,6 @@
|
|||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/word-wrap": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
|
||||
"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/wrap-ansi": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
|
||||
index 7ff599a..85b3bfa 100644
|
||||
--- a/scripts/build/common.mjs
|
||||
+++ b/scripts/build/common.mjs
|
||||
@@ -24,7 +24,7 @@ import { promisify } from "util";
|
||||
|
||||
export const watch = process.argv.includes("--watch");
|
||||
export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
|
||||
-export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
|
||||
+export const gitHash = "v@version@";
|
||||
export const banner = {
|
||||
js: `
|
||||
// Vencord ${gitHash}
|
||||
@@ -124,11 +124,7 @@ export const gitRemotePlugin = {
|
||||
namespace: "git-remote", path: args.path
|
||||
}));
|
||||
build.onLoad({ filter, namespace: "git-remote" }, async () => {
|
||||
- const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
|
||||
- const remote = res.stdout.trim()
|
||||
- .replace("https://github.com/", "")
|
||||
- .replace("git@github.com:", "")
|
||||
- .replace(/.git$/, "");
|
||||
+ const remote = "Vendicated/Vencord";
|
||||
|
||||
return { contents: `export default "${remote}"` };
|
||||
});
|
|
@ -22,7 +22,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.83.1";
|
||||
version = "0.84.0";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
|
@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
|
|||
owner = "nushell";
|
||||
repo = "nushell";
|
||||
rev = version;
|
||||
hash = "sha256-WMMGsJFgUkascCja7v0VA3spaOb5QmMFXQ2JOT9beO4=";
|
||||
hash = "sha256-vXtQUWKRPS53IBUgO9Dw8dVzfD5W2kHSPOZHs293O5Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/0+k3qOM9/rY6XmeVjqQWkjv19yZTkmfMK51z4+ppJU=";
|
||||
cargoHash = "sha256-NtTCuTWbGTrGKF7ulm3Bfal/WuBtPEX7QvHoOyKY1V8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nu_scripts";
|
||||
version = "unstable-2023-07-29";
|
||||
version = "unstable-2023-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = pname;
|
||||
rev = "3ee56c6ec31fcc8dbffee85e1c73eb6fe0bbba8d";
|
||||
hash = "sha256-luGIvcKOfhDorPfGfL449+eD+58MGo5jMCsNwIRJWt4=";
|
||||
rev = "45c051dad0e243a63608c8274b7fddd5f0b74941";
|
||||
hash = "sha256-kpE+vgobYsQuh8sS3gK/yg68nQykquwteeuecjLtIrE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -11,9 +11,9 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname;
|
||||
version = "0.83.1";
|
||||
version = "0.84.0";
|
||||
src = nushell.src;
|
||||
cargoHash = "sha256-qRKONc8rDRALEin8WGxi7Jma4uD+U+9Gu6zpmYWmGOc=";
|
||||
cargoHash = "sha256-RcwCYfIEV0+NbZ99uWaCOLqLap3wZ4qXIsc02fqkBSQ=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
cargoBuildFlags = [ "--package nu_plugin_gstat" ];
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nushell_plugin_query";
|
||||
version = "0.83.1";
|
||||
version = "0.84.0";
|
||||
|
||||
src = nushell.src;
|
||||
|
||||
cargoHash = "sha256-0Bcu2h1ooc4z4ezKSjl7ca5cNQwnF3je7XzdhuqP4iQ=";
|
||||
cargoHash = "sha256-8uAoiurQpI++duheNqwEDw/0CIPE1dHcgL48hKWqNUg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, fetchurl, appimageTools }:
|
||||
let
|
||||
name = "vial-${version}";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
pname = "Vial";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
|
||||
sha256 = "sha256-2EapikmY79KQdoHnz1A7gErVXBN8D80r1GJMKQ5gIM0=";
|
||||
hash = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
|
@ -23,11 +23,13 @@ appimageTools.wrapType2 {
|
|||
echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Open-source QMK GUI fork for configuring your keyboard in real time";
|
||||
meta = {
|
||||
description = "An Open-source GUI and QMK fork for configuring your keyboard in real time";
|
||||
homepage = "https://get.vial.today";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "vial";
|
||||
maintainers = with lib.maintainers; [ kranzes ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
39
pkgs/tools/security/imdshift/default.nix
Normal file
39
pkgs/tools/security/imdshift/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "imdshift";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ayushpriya10";
|
||||
repo = "IMDShift";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Uoa0uNOhCkT622Yy8GEg8jz9k5zmtXwGmvdb3MVTLX8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
boto3
|
||||
click
|
||||
prettytable
|
||||
tqdm
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"IMDShift"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to migrate workloads to IMDSv2";
|
||||
homepage = "https://github.com/ayushpriya10/IMDShift";
|
||||
changelog = "https://github.com/ayushpriya10/IMDShift/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swtpm";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stefanberger";
|
||||
repo = "swtpm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O+sHkmQ47FbqsgWpaqAc/j2AJ5xzsvpBj/p0Zea1nSI=";
|
||||
sha256 = "sha256-QKR5S7FlMFDw4+VpyRdqixMWyzLpQkf3QCUceQvsliU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,6 +12,25 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libxml2 ];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
echo -n 'checking csv2 and 2csv...'
|
||||
$out/bin/csv2 -f <<< $'a,b\n1,2' \
|
||||
| $out/bin/2csv record a b \
|
||||
| grep -qF '1,2'
|
||||
echo ' ok'
|
||||
|
||||
echo -n 'checking xml2 and 2xml...'
|
||||
$out/bin/xml2 <<< $'<a>abc</a>' \
|
||||
| $out/bin/2xml \
|
||||
| grep -qF '<a>abc</a>'
|
||||
echo ' ok'
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2";
|
||||
description = "Tools for command line processing of XML, HTML, and CSV";
|
||||
|
|
|
@ -2020,20 +2020,20 @@ mapAliases ({
|
|||
https://github.com/NixOS/nixpkgs/pull/101369 */
|
||||
|
||||
inherit (plasma5Packages)
|
||||
akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
|
||||
akonadi akregator arianna ark bluedevil bomber bovo breeze-grub breeze-gtk
|
||||
breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon
|
||||
ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
|
||||
kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
|
||||
kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
|
||||
kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
|
||||
kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php
|
||||
kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy
|
||||
kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind
|
||||
kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
|
||||
kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
|
||||
knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
|
||||
konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker
|
||||
kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch
|
||||
kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited
|
||||
marble milou minuet okular oxygen oxygen-icons5 picmi
|
||||
marble merkuro milou minuet okular oxygen oxygen-icons5 picmi
|
||||
plasma-browser-integration plasma-desktop plasma-integration plasma-nano
|
||||
plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt
|
||||
plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent
|
||||
|
@ -2041,6 +2041,9 @@ mapAliases ({
|
|||
systemsettings xdg-desktop-portal-kde yakuake zanshin
|
||||
;
|
||||
|
||||
kalendar = merkuro; # Renamed in 23.08
|
||||
kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08";
|
||||
|
||||
inherit (plasma5Packages.thirdParty)
|
||||
krohnkite
|
||||
krunner-ssh
|
||||
|
|
|
@ -19305,6 +19305,8 @@ with pkgs;
|
|||
|
||||
funzzy = callPackage ../development/tools/misc/funzzy { };
|
||||
|
||||
futuresql = libsForQt5.callPackage ../development/libraries/futuresql { };
|
||||
|
||||
fzf-make = callPackage ../development/tools/misc/fzf-make { };
|
||||
|
||||
gede = libsForQt5.callPackage ../development/tools/misc/gede { };
|
||||
|
@ -30497,8 +30499,6 @@ with pkgs;
|
|||
|
||||
argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
|
||||
|
||||
arianna = libsForQt5.callPackage ../applications/misc/arianna { };
|
||||
|
||||
ario = callPackage ../applications/audio/ario { };
|
||||
|
||||
arion = callPackage ../applications/virtualization/arion { };
|
||||
|
@ -32935,6 +32935,8 @@ with pkgs;
|
|||
|
||||
inherit (nodePackages) imapnotify;
|
||||
|
||||
imdshift = callPackage ../tools/security/imdshift { };
|
||||
|
||||
img2pdf = with python3Packages; toPythonApplication img2pdf;
|
||||
|
||||
imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { };
|
||||
|
|
|
@ -5,20 +5,13 @@
|
|||
# Recommended: simply use `emacsWithPackages` with the packages you want.
|
||||
#
|
||||
# Alternative: use `emacs`, install everything to a system or user profile
|
||||
# and then add this at the start your `init.el`:
|
||||
# and then add this at the start your `early-init.el`:
|
||||
/*
|
||||
(require 'package)
|
||||
|
||||
;; optional. makes unpure packages archives unavailable
|
||||
(setq package-archives nil)
|
||||
|
||||
;; optional. use this if you install emacs packages to the system profile
|
||||
(add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
|
||||
|
||||
;; optional. use this if you install emacs packages to user profiles (with nix-env)
|
||||
(add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
|
||||
|
||||
(package-initialize)
|
||||
*/
|
||||
|
||||
{ pkgs'
|
||||
|
|
Loading…
Reference in a new issue