Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
de1ff46f80
29 changed files with 1174 additions and 1090 deletions
|
|
@ -15,8 +15,8 @@ let
|
|||
(if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
|
||||
|
||||
# Run the tests for each platform. You can run a test by doing
|
||||
# e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
|
||||
# ‘nix-build tests/login.nix -A result’.
|
||||
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
|
||||
# or equivalently, ‘nix-build tests/login.nix’.
|
||||
# See also nixosTests in pkgs/top-level/all-packages.nix
|
||||
allTestsForSystem = system:
|
||||
import ./tests/all-tests.nix {
|
||||
|
|
|
|||
60
pkgs/applications/audio/radioboat/default.nix
Normal file
60
pkgs/applications/audio/radioboat/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, mpv
|
||||
, makeWrapper
|
||||
, installShellFiles
|
||||
, nix-update-script
|
||||
, testers
|
||||
, radioboat
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "radioboat";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slashformotion";
|
||||
repo = "radioboat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZAKTWmK3hCJxm/578cjtdgMA2ZRhCFtzfGdta0gmuFY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-X3KiqaiOQYQBfVckh50C+4oxIVN6gXyNuQtBwGvjdFQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/slashformotion/radioboat/internal/buildinfo.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/radioboat --prefix PATH ":" "${lib.makeBinPath [ mpv ]}";
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd radioboat \
|
||||
--bash <($out/bin/radioboat completion bash) \
|
||||
--fish <($out/bin/radioboat completion fish) \
|
||||
--zsh <($out/bin/radioboat completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { attrPath = pname; };
|
||||
tests.version = testers.testVersion {
|
||||
package = radioboat;
|
||||
command = "radioboat version";
|
||||
version = version;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal web radio client";
|
||||
homepage = "https://github.com/slashformotion/radioboat";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
|
||||
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
|
||||
|
||||
# For `digitaglinktree`
|
||||
, perl, sqlite
|
||||
|
|
@ -56,21 +56,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "digikam";
|
||||
version = "7.6.0";
|
||||
version = "7.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
|
||||
sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE=";
|
||||
sha256 = "sha256-wMbdLqigdRSsvyRi86VFGOfoCZszN/iBM2Foz/Y9dxw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "akonadi-22.04.patch";
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch";
|
||||
sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -78,8 +78,8 @@ let
|
|||
akregator = callPackage ./akregator.nix {};
|
||||
ark = callPackage ./ark {};
|
||||
baloo-widgets = callPackage ./baloo-widgets.nix {};
|
||||
bovo = callPackage ./bovo.nix {};
|
||||
bomber = callPackage ./bomber.nix {};
|
||||
bovo = callPackage ./bovo.nix {};
|
||||
calendarsupport = callPackage ./calendarsupport.nix {};
|
||||
dolphin = callPackage ./dolphin.nix {};
|
||||
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
|
||||
|
|
@ -120,13 +120,13 @@ let
|
|||
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
|
||||
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
|
||||
kdenlive = callPackage ./kdenlive {};
|
||||
kdepim-runtime = callPackage ./kdepim-runtime {};
|
||||
kdepim-addons = callPackage ./kdepim-addons.nix {};
|
||||
kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {};
|
||||
kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {};
|
||||
kdepim-runtime = callPackage ./kdepim-runtime {};
|
||||
kdev-php = callPackage ./kdevelop/kdev-php.nix {};
|
||||
kdev-python = callPackage ./kdevelop/kdev-python.nix {};
|
||||
kdevelop = callPackage ./kdevelop/wrapper.nix {};
|
||||
kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {};
|
||||
kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {};
|
||||
kdf = callPackage ./kdf.nix {};
|
||||
kdialog = callPackage ./kdialog.nix {};
|
||||
kdiamond = callPackage ./kdiamond.nix {};
|
||||
|
|
@ -142,10 +142,10 @@ let
|
|||
kigo = callPackage ./kigo.nix {};
|
||||
killbots = callPackage ./killbots.nix {};
|
||||
kimap = callPackage ./kimap.nix {};
|
||||
kipi-plugins = callPackage ./kipi-plugins.nix {};
|
||||
kitinerary = callPackage ./kitinerary.nix {};
|
||||
kio-extras = callPackage ./kio-extras.nix {};
|
||||
kio-gdrive = callPackage ./kio-gdrive.nix {};
|
||||
kipi-plugins = callPackage ./kipi-plugins.nix {};
|
||||
kitinerary = callPackage ./kitinerary.nix {};
|
||||
kldap = callPackage ./kldap.nix {};
|
||||
kleopatra = callPackage ./kleopatra.nix {};
|
||||
klettres = callPackage ./klettres.nix {};
|
||||
|
|
@ -169,25 +169,26 @@ let
|
|||
kollision = callPackage ./kollision.nix {};
|
||||
kolourpaint = callPackage ./kolourpaint.nix {};
|
||||
kompare = callPackage ./kompare.nix {};
|
||||
konqueror = callPackage ./konqueror.nix {};
|
||||
konquest = callPackage ./konquest.nix {};
|
||||
konsole = callPackage ./konsole.nix {};
|
||||
kontact = callPackage ./kontact.nix {};
|
||||
konversation = callPackage ./konversation.nix {};
|
||||
kontactinterface = callPackage ./kontactinterface.nix {};
|
||||
konquest = callPackage ./konquest.nix {};
|
||||
konqueror = callPackage ./konqueror.nix {};
|
||||
korganizer = callPackage ./korganizer.nix {};
|
||||
kpat = callPackage ./kpat.nix {};
|
||||
kpimtextedit = callPackage ./kpimtextedit.nix {};
|
||||
ksmtp = callPackage ./ksmtp {};
|
||||
ksquares = callPackage ./ksquares.nix {};
|
||||
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
|
||||
kpkpass = callPackage ./kpkpass.nix {};
|
||||
kpublictransport = callPackage ./kpublictransport.nix {};
|
||||
kreversi = callPackage ./kreversi.nix {};
|
||||
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
|
||||
krdc = callPackage ./krdc.nix {};
|
||||
kreversi = callPackage ./kreversi.nix {};
|
||||
krfb = callPackage ./krfb.nix {};
|
||||
kruler = callPackage ./kruler.nix {};
|
||||
kshisen = callPackage ./kshisen.nix {};
|
||||
ksmtp = callPackage ./ksmtp {};
|
||||
kspaceduel = callPackage ./kspaceduel.nix {};
|
||||
ksquares = callPackage ./ksquares.nix {};
|
||||
ksudoku = callPackage ./ksudoku.nix {};
|
||||
ksystemlog = callPackage ./ksystemlog.nix {};
|
||||
kteatime = callPackage ./kteatime.nix {};
|
||||
|
|
@ -220,9 +221,9 @@ let
|
|||
minuet = callPackage ./minuet.nix {};
|
||||
okular = callPackage ./okular.nix {};
|
||||
picmi = callPackage ./picmi.nix {};
|
||||
pimcommon = callPackage ./pimcommon.nix {};
|
||||
pim-data-exporter = callPackage ./pim-data-exporter.nix {};
|
||||
pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
|
||||
pimcommon = callPackage ./pimcommon.nix {};
|
||||
print-manager = callPackage ./print-manager.nix {};
|
||||
rocs = callPackage ./rocs.nix {};
|
||||
skanlite = callPackage ./skanlite.nix {};
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.2/src -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.3/src -A '*.tar.xz' )
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, kbookmarks
|
||||
|
|
@ -17,6 +15,7 @@
|
|||
, kiconthemes
|
||||
, kidletime
|
||||
, kitemviews
|
||||
, knewstuff
|
||||
, knotifications
|
||||
, knotifyconfig
|
||||
, kwindowsystem
|
||||
|
|
@ -26,16 +25,11 @@
|
|||
, solid
|
||||
, sonnet
|
||||
, phonon
|
||||
, qtmultimedia
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
mkDerivation {
|
||||
pname = "konversation";
|
||||
version = "1.7.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
kbookmarks
|
||||
|
|
@ -52,6 +46,7 @@ mkDerivation rec {
|
|||
kiconthemes
|
||||
kidletime
|
||||
kitemviews
|
||||
knewstuff
|
||||
knotifications
|
||||
knotifyconfig
|
||||
kwindowsystem
|
||||
|
|
@ -61,6 +56,7 @@ mkDerivation rec {
|
|||
solid
|
||||
sonnet
|
||||
phonon
|
||||
qtmultimedia
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -71,7 +67,6 @@ mkDerivation rec {
|
|||
meta = {
|
||||
description = "Integrated IRC client for KDE";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
homepage = "https://konversation.kde.org";
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -199,12 +199,12 @@ stdenv.mkDerivation {
|
|||
inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
|
||||
baseUrl =
|
||||
if channel == "devedition"
|
||||
then "http://archive.mozilla.org/pub/devedition/releases/"
|
||||
else "http://archive.mozilla.org/pub/firefox/releases/";
|
||||
then "https://archive.mozilla.org/pub/devedition/releases/"
|
||||
else "https://archive.mozilla.org/pub/firefox/releases/";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Mozilla Firefox, free web browser (binary package)";
|
||||
homepage = "http://www.mozilla.org/firefox/";
|
||||
homepage = "https://www.mozilla.org/firefox/";
|
||||
license = licenses.mpl20;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libwebp, pidgin, tdlib } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tdlib-purple";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ars3niy";
|
||||
repo = "tdlib-purple";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mrowzTtNLyMc2WwLVIop8Mg2DbyiQs0OPXmJuM9QUnM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Update to tdlib 1.8.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ars3niy/tdlib-purple/commit/8c87b899ddbec32ec6ab4a34ddf0dc770f97d396.patch";
|
||||
sha256 = "sha256-sysPYPno+wS8mZwQAXtX5eVnhwKAZrtr5gXuddN3mko=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION "lib/purple-2|' CMakeLists.txt
|
||||
sed -i -e 's|DESTINATION.*PURPLE_DATA_DIR}|DESTINATION "share|' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libwebp pidgin tdlib ];
|
||||
|
||||
cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ars3niy/tdlib-purple";
|
||||
description = "libpurple Telegram plugin using tdlib";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-purple";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "majn";
|
||||
repo = "telegram-purple";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ pidgin libwebp libgcrypt gettext ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i "s|/etc/telegram-purple/server.tglpub|$out/lib/purple-2/server.tglpub|g" telegram-purple.c
|
||||
echo "#define GIT_COMMIT \"${builtins.substring 0 10 src.rev}\"" > commit.h
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/purple-2/
|
||||
cp bin/*.so $out/lib/purple-2/ #*/
|
||||
cp tg-server.tglpub $out/lib/purple-2/server.tglpub
|
||||
mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48}
|
||||
cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16
|
||||
cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22
|
||||
cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/majn/telegram-purple";
|
||||
description = "Telegram for Pidgin / libpurple";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.jagajaga ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +1,24 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index c3e139e..b77d8bd 100644
|
||||
index fb17c7e..ef157e5 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1761,11 +1761,11 @@ dependencies = [
|
||||
|
||||
@@ -2332,10 +2332,10 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "magnum-opus"
|
||||
-version = "0.3.4-2"
|
||||
-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f"
|
||||
+version = "0.4.0"
|
||||
version = "0.4.0"
|
||||
-source = "git+https://github.com/open-trade/magnum-opus#3c3d0b86ae95c84930bebffe4bcb03b3bd83342b"
|
||||
+source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604"
|
||||
dependencies = [
|
||||
- "bindgen 0.59.1",
|
||||
- "bindgen",
|
||||
- "target_build_utils",
|
||||
+ "libc",
|
||||
+ "opusic-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2188,6 +2188,16 @@ version = "0.1.4"
|
||||
@@ -2796,6 +2796,16 @@ version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
|
||||
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
|
||||
|
||||
+[[package]]
|
||||
+name = "opusic-sys"
|
||||
|
|
@ -33,18 +31,18 @@ index c3e139e..b77d8bd 100644
|
|||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "parity-tokio-ipc"
|
||||
version = "0.7.2"
|
||||
name = "os_str_bytes"
|
||||
version = "6.0.0"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 75504a0..43e1624 100644
|
||||
index 1b715bd..960e8da 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -32,7 +32,7 @@ libc = "0.2"
|
||||
@@ -35,7 +35,7 @@ libc = "0.2"
|
||||
parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
|
||||
flexi_logger = "0.17"
|
||||
flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] }
|
||||
runas = "0.2"
|
||||
-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" }
|
||||
+magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" }
|
||||
dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
|
||||
rubato = { version = "0.8", optional = true }
|
||||
rubato = { version = "0.12", optional = true }
|
||||
samplerate = { version = "0.2", optional = true }
|
||||
|
|
|
|||
|
|
@ -24,20 +24,21 @@
|
|||
, libsciter
|
||||
, llvmPackages
|
||||
, wrapGAppsHook
|
||||
, writeText
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustdesk";
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustdesk";
|
||||
repo = "rustdesk";
|
||||
rev = "0325500ebf331b66220cec6e9078afb83b0e98a7";
|
||||
sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg=";
|
||||
rev = version;
|
||||
sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw=";
|
||||
cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE=";
|
||||
|
||||
LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
|
|
@ -51,10 +52,29 @@ rustPlatform.buildRustPackage rec {
|
|||
# properly.
|
||||
postUnpack = let
|
||||
vcpkg_target = "x64-linux";
|
||||
|
||||
updates_vcpkg_file = writeText "update_vcpkg_rustdesk"
|
||||
''
|
||||
Package : libyuv
|
||||
Architecture : ${vcpkg_target}
|
||||
Version : 1.0
|
||||
Status : is installed
|
||||
|
||||
Package : libvpx
|
||||
Architecture : ${vcpkg_target}
|
||||
Version : 1.0
|
||||
Status : is installed
|
||||
'';
|
||||
in ''
|
||||
export VCPKG_ROOT="$TMP/vcpkg";
|
||||
|
||||
mkdir -p $VCPKG_ROOT/.vcpkg-root
|
||||
mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
|
||||
mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
|
||||
ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
|
||||
mkdir -p $VCPKG_ROOT/installed/vcpkg/info
|
||||
touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list
|
||||
touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list
|
||||
|
||||
ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "materia-kde-theme";
|
||||
version = "20210814";
|
||||
version = "20220607";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = "materia-kde";
|
||||
rev = version;
|
||||
sha256 = "KfC1nB5WUcYixqSy5XCP+6Uqhs07Y3p2F1H+5HB8wAg=";
|
||||
sha256 = "sha256-xshkp1Y5V8A3Fj4HCkmFpWcw3xEuNyRJqOLBkIKhwpQ=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.1.3";
|
||||
version = "22.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-YckzS9f0q+5YOR+8mTZ/u67NVFrwLllxfEuojuJC84E=";
|
||||
sha256 = "sha256-A7XZXkYBsFa8NMQA7EBnvEReSTorAGgoow08bMZ+WkQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.44";
|
||||
version = "0.3.45";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-C7dknDfoN4rwXI5/YhsKXoertpQUpoOKrbbW4yVXrgQ=";
|
||||
hash = "sha256-OmUN6wpsVP9/CS+JkEhirDBp1MqeA3oEcU77T5nJ9GU=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "0.0.20";
|
||||
version = "0.0.23";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-n5knh8MbT0CUvPBABRAewMN9AU5afV5CBAM8hqgdHw0=";
|
||||
hash = "sha256-kiPDBhqQQJkVR/PWCKd4OFCIRznY3y6pgXiBQ3hBaaM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Q0dLstAwLamc2DCN1RMwPFHkvxGeGjLiUnyrkeAol0E=";
|
||||
sha256 = "sha256-8o6OeewuiptrlkVNm2I7fwtqPAt+nNOHveIUEWDjyN0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2022.7.1";
|
||||
version = "2022.7.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-V+g4TlwnTuirmxoMmq/A0dGKqubEH8ObPuroXKbSH8U=";
|
||||
sha256 = "sha256-nzP2BvEH9PytauF0q86s4vCSEuGtku+WIu4ttIzf8bU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@ buildPythonPackage rec {
|
|||
ruamel-yaml
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-fDHtdznxawX+gmFedxQLTTEvpDhhZLSbEndtXOgahUM=";
|
||||
sha256 = "sha256-wAhi8TW0rOeJ3QWjmfLqJ3cKnLZShMekyQ6j7I2uwGY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -44,8 +44,7 @@ let
|
|||
# Reduced debug info conflict with BTF and have been enabled in
|
||||
# aarch64 defconfig since 5.13
|
||||
DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no);
|
||||
# Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22`
|
||||
DEBUG_INFO_BTF = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes));
|
||||
DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes);
|
||||
BPF_LSM = whenAtLeast "5.7" (option yes);
|
||||
DEBUG_KERNEL = yes;
|
||||
DEBUG_DEVRES = no;
|
||||
|
|
|
|||
|
|
@ -120,8 +120,7 @@ installPhase() {
|
|||
fi
|
||||
|
||||
# Install libraries needed by Proton to support DLSS
|
||||
install -Dm644 nvngx.dll $i/lib/nvidia/wine/
|
||||
install -Dm644 _nvngx.dll $i/lib/nvidia/wine/
|
||||
install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll
|
||||
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
sha256 = "sha256-3GeWrkTL3HJQsVBafjSQXHsf1nbVzSVSDZWcJlD22Nw=";
|
||||
sha256 = "sha256-LPunSNKF0HBlmYOn0AIT0zLSVmLaizDnDchJhMjexfM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.5.6";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VXbrwUf43qvXd+/GXNA+Wkt4E5EM4+1V0wPj3JONzlU=";
|
||||
sha256 = "sha256-/alVraVGggViOxWZsFgdBE49PPzZijLP+ky9F686Ano=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-45rQHG5Std7m7Xu8OEFfjdG6RyriM4yAPzJl7M2lPW8=";
|
||||
vendorSha256 = "sha256-RBaMQyjqlQkH4tvgkqemIG3c0IzZiMpaa3SsSebV2Zs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,17 +11,25 @@
|
|||
, gsoap
|
||||
, openssl
|
||||
, zlib
|
||||
# Configuration overridable with .override
|
||||
# If not null, the builder will
|
||||
# move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
|
||||
, externalEtc ? "/etc"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "voms-unstable";
|
||||
version = "2021-05-04";
|
||||
version = "2022-06-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "italiangrid";
|
||||
repo = "voms";
|
||||
rev = "61563152fce3a4e6860dd8ab8ab6e72b7908d8b8";
|
||||
sha256 = "LNR0G4XrgxqjQmjyaKoZJLNoxtAGiTM93FG3jIU1u+Y=";
|
||||
rev = "8e99bb96baaf197f0f557836e2829084bb1bb00e"; # develop branch
|
||||
hash = "sha256-FG4fHO2lsQ3t/ZaKT9xY+xqdQHfdtzi5ULtxLhdPnss=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit externalEtc;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -59,8 +67,15 @@ stdenv.mkDerivation rec{
|
|||
"--with-gsoap-wsdl2h=${gsoap}/bin/wsdl2h"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
${lib.optionalString (externalEtc != null) ''
|
||||
mv "$out"/etc{,.orig}
|
||||
ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
|
||||
''}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The VOMS native service and APIs";
|
||||
description = "The C/C++ VOMS server, client and APIs v2.x";
|
||||
homepage = "https://italiangrid.github.io/voms/";
|
||||
changelog = "https://github.com/italiangrid/voms/blob/master/ChangeLog";
|
||||
license = licenses.asl20;
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xrootd";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrootd";
|
||||
repo = "xrootd";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-k6uAJbUhpwnRrSeGn4JQiHDBrGJNQDf5vG2a+je5ByU=";
|
||||
hash = "sha256-BlMYm4ffSpUxqMjlDVZC59KOuLvwsk/BeBB3VBjAwjs=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc }:
|
||||
{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }:
|
||||
|
||||
let
|
||||
flreSrc = fetchFromGitHub {
|
||||
|
|
@ -36,6 +36,9 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ fpc ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
NIX_LDFLAGS = [ "-lcrypto" ];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs \
|
||||
|
|
|
|||
|
|
@ -1655,15 +1655,15 @@ mapAliases ({
|
|||
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
|
||||
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 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 powerdevil qqc2-breeze-style
|
||||
sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde
|
||||
yakuake zanshin
|
||||
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
|
||||
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
|
||||
powerdevil qqc2-breeze-style sddm-kcm skanlite skanpage spectacle
|
||||
systemsettings xdg-desktop-portal-kde yakuake zanshin
|
||||
;
|
||||
|
||||
inherit (plasma5Packages.thirdParty)
|
||||
|
|
|
|||
|
|
@ -28045,8 +28045,6 @@ with pkgs;
|
|||
|
||||
kondo = callPackage ../applications/misc/kondo { };
|
||||
|
||||
konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
|
||||
|
||||
kooha = callPackage ../applications/video/kooha { };
|
||||
|
||||
# Qt 5.15 is not default on mac, tdesktop requires 5.15 (and kotatogram subsequently)
|
||||
|
|
@ -29484,7 +29482,7 @@ with pkgs;
|
|||
|
||||
purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { };
|
||||
|
||||
telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
|
||||
tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { };
|
||||
|
||||
toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
|
||||
libtoxcore = libtoxcore-new;
|
||||
|
|
@ -29786,6 +29784,8 @@ with pkgs;
|
|||
|
||||
roomeqwizard = callPackage ../applications/audio/roomeqwizard { };
|
||||
|
||||
radioboat = callPackage ../applications/audio/radioboat { };
|
||||
|
||||
radiotray-ng = callPackage ../applications/audio/radiotray-ng {
|
||||
wxGTK = wxGTK30;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue