Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
K900
@@ -17,8 +17,8 @@ let
|
||||
sha256Hash = "sha256-UxxofUCJGhQTLMwHGaSdNDqWnjkpRVwm2oqLLp3jR8E=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.3.2.1"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 1"
|
||||
sha256Hash = "sha256-qJKkuB8v4wOqEQwnDyMegLbRLzxVwCq/hS1TQ3lhBKk=";
|
||||
version = "2024.3.2.2"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 2"
|
||||
sha256Hash = "sha256-P0yBlqcuTSmJ4gmSvSCW31ARqDBC3NC8PozQHIXPS8Y=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dave";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micromata";
|
||||
repo = "dave";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JgRclcSrdgTXBuU8attSbDhRj4WUGXSpKTrUZ8mP5ns=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yo6DEvKnCQak+MrpIIDU4DkRhRP+HeJXLV87NRf6g/c=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dave"
|
||||
"cmd/davecli"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
"-X main.builtBy=nixpkgs"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/micromata/dave";
|
||||
description = "Totally simple and very easy to configure stand alone webdav server";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ lunik1 ];
|
||||
mainProgram = "dave";
|
||||
};
|
||||
}
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-asn-lite";
|
||||
version = "2025-01";
|
||||
version = "2025-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-cRlhlP5ml+swBZGiLpVH5s7nvPiHUi7qxM2GajoeK+Y=";
|
||||
hash = "sha256-lQmBPlaUib2NDLNmrB7x2HiSRXcIi3uC8wxEEBtbecI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-city-lite";
|
||||
version = "2025-01";
|
||||
version = "2025-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-fBS2JASkZaLNCjNAadNkrctixTkDvpkTUYP0yUHBXnw=";
|
||||
hash = "sha256-p0cLbcLeoqemY4zhK7tNP//9H27BV6YOLBTgDqdcI7Q=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-country-lite";
|
||||
version = "2025-01";
|
||||
version = "2025-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-PVpqo1t6V0kdVqA1aEgU0UqwhzmLLMHYB6gyoMusVv8=";
|
||||
hash = "sha256-/VsGdiiDkY13fyfLoa3N1nVJEVUrqRPNFg3Bs6MVkLY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -6,21 +6,22 @@
|
||||
openssl,
|
||||
stdenv,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hydra-check";
|
||||
version = "2.0.1";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "hydra-check";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QdCXToHNymOdlTyQjk9eo7LTznGKB+3pIOgjjaGoTXg=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h8bs6oe8zkzEDCoC9F6IzTaTkNf4eAAjt663V0qn73I=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-zjpsMuwOdDm4St8M0h4yoJhTirgANJ6s5hfbayyq/uE=";
|
||||
cargoHash = "sha256-aV4URx9bGAOLWRh/kFDU67GiXk7RdCqfahG+fZPfdUo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -38,6 +39,12 @@ rustPlatform.buildRustPackage rec {
|
||||
--zsh <($out/bin/hydra-check --shell-completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Check hydra for the build status of a package";
|
||||
homepage = "https://github.com/nix-community/hydra-check";
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "libmaddy-markdown";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "progsource";
|
||||
repo = "maddy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sVUXACT94PSPcohnOyIp7KK8baCBuf6ZNMIyk6Cfdjg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/include/maddy
|
||||
install -Dm444 include/maddy/* -t $out/include/maddy
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "C++ Markdown to HTML header-only parser library";
|
||||
homepage = "https://github.com/progsource/maddy";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.normalcea ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,83 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
validatePkgConfig,
|
||||
openssl,
|
||||
sqlcipher,
|
||||
boost,
|
||||
curl,
|
||||
glib,
|
||||
libsecret,
|
||||
libmaddy-markdown,
|
||||
testers,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libnick";
|
||||
version = "2025.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickvisionApps";
|
||||
repo = "libnick";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Y7Vn9KaZjEJ29o2GouNl5B/svAtJ24El9WYgXHhnxho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
ninja
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isUnix [
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
boost
|
||||
libmaddy-markdown
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isUnix [
|
||||
glib
|
||||
openssl
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isWindows sqlcipher;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
curl
|
||||
libsecret
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeFeature "USE_LIBSECRET" "true")
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/libnick.pc.in \
|
||||
--replace-fail 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' \
|
||||
'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' \
|
||||
--replace-fail 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' \
|
||||
'includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@'
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform development base for native Nickvision applications";
|
||||
homepage = "https://github.com/NickvisionApps/libnick";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.normalcea ];
|
||||
platforms = lib.platforms.unix ++ lib.platforms.windows;
|
||||
pkgConfigModules = [ "libnick" ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
libxml2,
|
||||
glibmm,
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxmlxx5";
|
||||
version = "5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gnome.org/sources/libxml++/${version}/libxml++-${lib.versions.pad 3 version}.tar.xz";
|
||||
hash = "sha256-6aI8Q2aGqUaY0hOOa8uvhJEh1jv6D1DcNP77/XlWaEg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [ glibmm ];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 ];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
meta = {
|
||||
description = "C++ wrapper for the libxml2 XML parser library";
|
||||
homepage = "https://libxmlplusplus.sourceforge.net/";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
maintainers = [ lib.maintainers.normalcea ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "natural-docs";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip";
|
||||
sha256 = "sha256-yk9PxrZ6+ocqGLB+xCBGiQKnHLMdp2r+NuoMhWsr0GM=";
|
||||
sha256 = "sha256-gjAhS2hdFA8G+E5bJD18BQdb7PrBeRnpBBSlnVJ5hgY=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
{
|
||||
"linux-386": {
|
||||
"sys": "linux-386",
|
||||
"url": "https://bin.equinox.io/a/cPMgrL2ncCb/ngrok-v3-3.18.1-linux-386",
|
||||
"sha256": "f0b85d6a2f7ab3bd48186100e0f619acd18d4bdf56df2cd7044e6b35745c17a4",
|
||||
"version": "3.18.1"
|
||||
"url": "https://bin.equinox.io/a/7rWAoLaoN6E/ngrok-v3-3.19.1-linux-386",
|
||||
"sha256": "ade3cb371e0420b4d314051f702029661ec051158892ae8de87b0dd3fb8c9ae2",
|
||||
"version": "3.19.1"
|
||||
},
|
||||
"linux-amd64": {
|
||||
"sys": "linux-amd64",
|
||||
"url": "https://bin.equinox.io/a/gnpHP5YLEsK/ngrok-v3-3.18.1-linux-amd64",
|
||||
"sha256": "7d0a1f40bfb10fd7304081dcc27d7b8d2bed86f39cd46825c07679d8c888975f",
|
||||
"version": "3.18.1"
|
||||
"url": "https://bin.equinox.io/a/aNKWdiDQehF/ngrok-v3-3.19.1-linux-amd64",
|
||||
"sha256": "eea9510a71beab13f50024c23938d00ba9cfe4a8b4840030b8432c8637b4427a",
|
||||
"version": "3.19.1"
|
||||
},
|
||||
"linux-arm": {
|
||||
"sys": "linux-arm",
|
||||
"url": "https://bin.equinox.io/a/mke1muTU2zp/ngrok-v3-3.18.1-linux-arm",
|
||||
"sha256": "6e7b4723a3a2c936157e4ec7be0bcbf95b49c672223ba0621d54165e8009fd78",
|
||||
"version": "3.18.1"
|
||||
"url": "https://bin.equinox.io/a/fHwvcnrN4W1/ngrok-v3-3.19.1-linux-arm",
|
||||
"sha256": "ff1260e987641b0b280e5da3004d020093745a7586ecca65e1025bc3738d55d9",
|
||||
"version": "3.19.1"
|
||||
},
|
||||
"linux-arm64": {
|
||||
"sys": "linux-arm64",
|
||||
"url": "https://bin.equinox.io/a/jYPr353ESuj/ngrok-v3-3.18.1-linux-arm64",
|
||||
"sha256": "0dbdfdf94b3acb777741e9eeeb27a256cb1975b7d366d1ba404804b863b8fcbb",
|
||||
"version": "3.18.1"
|
||||
"url": "https://bin.equinox.io/a/ckBcN6JRV3s/ngrok-v3-3.19.1-linux-arm64",
|
||||
"sha256": "1f8eec521c00eece4a4a15750927dc492f1243e34598868b15996940ab2bed5b",
|
||||
"version": "3.19.1"
|
||||
},
|
||||
"darwin-amd64": {
|
||||
"sys": "darwin-amd64",
|
||||
"url": "https://bin.equinox.io/a/iTdNrZisjJj/ngrok-v3-3.18.1-darwin-amd64",
|
||||
"sha256": "9a1319caf566ee7f85c1a9b2982ee95c08bd549e90d56ac99ef863d5da92b4a4",
|
||||
"version": "3.18.1"
|
||||
"url": "https://bin.equinox.io/a/yubNbWvsvB/ngrok-v3-3.19.1-darwin-amd64",
|
||||
"sha256": "4e19fee94598a74164516a8b439742bd8bee8844bfea4e3f41ba33b761323583",
|
||||
"version": "3.19.1"
|
||||
},
|
||||
"darwin-arm64": {
|
||||
"sys": "darwin-arm64",
|
||||
"url": "https://bin.equinox.io/a/6wGwyzYTbRX/ngrok-v3-3.18.1-darwin-arm64",
|
||||
"sha256": "9cc3fee7d81157e6bc645f160f6aa5562577c4b9f72db8675143e16d07703816",
|
||||
"version": "3.18.1"
|
||||
"url": "https://bin.equinox.io/a/iv6WKkDK2i5/ngrok-v3-3.19.1-darwin-arm64",
|
||||
"sha256": "1da4acdf28b7c64ded056d29a2f3bb452481b4112a04f520f33fcead8794e2a1",
|
||||
"version": "3.19.1"
|
||||
}
|
||||
}
|
||||
|
||||
Generated
-237
@@ -1,237 +0,0 @@
|
||||
[
|
||||
{
|
||||
"pname": "Ace4896.DBus.Services.Secrets",
|
||||
"version": "1.2.0",
|
||||
"sha256": "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn"
|
||||
},
|
||||
{
|
||||
"pname": "Cake.Tool",
|
||||
"version": "4.0.0",
|
||||
"sha256": "11vc5fimi6w465081sqxs4zhw7grr6v8ga7nl1mscdl43wv33ql2"
|
||||
},
|
||||
{
|
||||
"pname": "GetText.NET",
|
||||
"version": "1.9.14",
|
||||
"sha256": "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Adw-1",
|
||||
"version": "0.5.0",
|
||||
"sha256": "130jwgkkphyhsk0c14kqmznx9ywfhiwa37lzjn2qgr68akgd3xd9"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Cairo-1.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "1x9d3jzzpf72gzxq6qf02ih2x79y9m5zqc874drl5wc8p1qbryzn"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.FreeType2-2.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "1688rn8dycqcslfk850w8w2pbs4b93nmj1xa6g4n6ncy799780cy"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Gdk-4.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "1v2nl9gh941lqzfvryslhgsx9nwaf91q131xrpilrmk18xn3hpd6"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.GdkPixbuf-2.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "0gbmckch435s2fxpxzqjwckfsxqsidv1nz3wil3v1a2iqvk3imnr"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Gio-2.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "1yx23jcyy7pzjkbcf0v0s4nw1n51rcaxf8dg7zqfzhvg9f0k2iwl"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.GLib-2.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "169y390cgda0ps60g2j6vf5bkr6bfmxvgzga8k697bsl3dfzkkvv"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.GObject-2.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "1w35a1kmn0ggnlwcsib9m4427299f9ylm7xkm69yzswdwzrfv1kj"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Graphene-1.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "16y836gzn9ah963lhg533hik8wh984j33gc60kzn8nziwxl6jplq"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Gsk-4.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "152c839l1lv6qc8pccmkzm72sfh45n9qpyyarxvllnn0lzhd50lf"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Gtk-4.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "0lj69qx9ksz9w94j4ryy8hr0ja60ijvx8wpr4l1i7ic01gsyxprc"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.HarfBuzz-0.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "0cnic254jwkndcdg51wvi1vvh4f947ylwg63ag428gfbmx0684c4"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.Pango-1.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "0p4ks9yk3d8pl9c58zc1ncdzw45fkkmgpwn29vj1wax73iml1k79"
|
||||
},
|
||||
{
|
||||
"pname": "GirCore.PangoCairo-1.0",
|
||||
"version": "0.5.0",
|
||||
"sha256": "0j532ixh9adk2gwg55w81m5hwy0c6a3307jr4157pbjg2qm1x4mn"
|
||||
},
|
||||
{
|
||||
"pname": "Markdig",
|
||||
"version": "0.33.0",
|
||||
"sha256": "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"
|
||||
},
|
||||
{
|
||||
"pname": "Meziantou.Framework.Win32.CredentialManager",
|
||||
"version": "1.4.5",
|
||||
"sha256": "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CSharp",
|
||||
"version": "4.7.0",
|
||||
"sha256": "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Data.Sqlite.Core",
|
||||
"version": "8.0.0",
|
||||
"sha256": "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
"sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Targets",
|
||||
"version": "5.0.0",
|
||||
"sha256": "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.SystemEvents",
|
||||
"version": "8.0.0",
|
||||
"sha256": "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"
|
||||
},
|
||||
{
|
||||
"pname": "Nickvision.Aura",
|
||||
"version": "2023.11.4",
|
||||
"sha256": "0gasyglp1pgi0s6zqzmbm603j3j36vvr68grv6g93fdj2vjlmkxs"
|
||||
},
|
||||
{
|
||||
"pname": "Octokit",
|
||||
"version": "9.0.0",
|
||||
"sha256": "0kw49w1hxk4d2x9598012z9q1yr3ml5rm06fy1jnmhy44s3d3jp5"
|
||||
},
|
||||
{
|
||||
"pname": "pythonnet",
|
||||
"version": "3.0.3",
|
||||
"sha256": "0qnivddg13vi1fb22z3krsj1gczyyfd56nmk6gas6qrwlxdzhriv"
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.bundle_e_sqlcipher",
|
||||
"version": "2.1.6",
|
||||
"sha256": "15v2x7y4k7cl47a9jccbvgbwngwi5dz6qhv0cxpcasx4v5i9aila"
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.core",
|
||||
"version": "2.1.6",
|
||||
"sha256": "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.lib.e_sqlcipher",
|
||||
"version": "2.1.6",
|
||||
"sha256": "0dl5an15whs4yl5hm2wibzbfigzck0flah8a07k99y1bhbmv080z"
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.provider.e_sqlcipher",
|
||||
"version": "2.1.6",
|
||||
"sha256": "1jx8d4dq5w2951b7w722gnxbfgdklwazc48kcbdzylkglwkrqgrq"
|
||||
},
|
||||
{
|
||||
"pname": "System.CodeDom",
|
||||
"version": "8.0.0",
|
||||
"sha256": "0zyzd15v0nf8gla7nz243m1kff8ia6vqp471i3g7xgawgj5n21dv"
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "8.0.0",
|
||||
"sha256": "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4"
|
||||
},
|
||||
{
|
||||
"pname": "System.IO",
|
||||
"version": "4.3.0",
|
||||
"sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "6.0.0",
|
||||
"sha256": "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"
|
||||
},
|
||||
{
|
||||
"pname": "System.Management",
|
||||
"version": "8.0.0",
|
||||
"sha256": "1zbwj6ii8axa4w8ymjzi9d9pj28nhswygahyqppvzaxypw6my2hz"
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.3",
|
||||
"sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.5",
|
||||
"sha256": "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection",
|
||||
"version": "4.3.0",
|
||||
"sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit",
|
||||
"version": "4.3.0",
|
||||
"sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit.ILGeneration",
|
||||
"version": "4.3.0",
|
||||
"sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Primitives",
|
||||
"version": "4.3.0",
|
||||
"sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime",
|
||||
"version": "4.3.0",
|
||||
"sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding",
|
||||
"version": "4.3.0",
|
||||
"sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks",
|
||||
"version": "4.3.0",
|
||||
"sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus",
|
||||
"version": "0.15.0",
|
||||
"sha256": "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.15.0",
|
||||
"sha256": "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"
|
||||
}
|
||||
]
|
||||
@@ -1,77 +1,120 @@
|
||||
{ lib
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, dotnetCorePackages
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, glib
|
||||
, shared-mime-info
|
||||
, gdk-pixbuf
|
||||
, blueprint-compiler
|
||||
, python3
|
||||
, ffmpeg
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gettext,
|
||||
itstool,
|
||||
ninja,
|
||||
yelp-tools,
|
||||
pkg-config,
|
||||
libnick,
|
||||
boost,
|
||||
glib,
|
||||
shared-mime-info,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
wrapGAppsHook4,
|
||||
libxmlxx5,
|
||||
blueprint-compiler,
|
||||
qt6,
|
||||
yt-dlp,
|
||||
ffmpeg,
|
||||
aria2,
|
||||
nix-update-script,
|
||||
uiPlatform ? "gnome",
|
||||
}:
|
||||
assert lib.assertOneOf "uiPlatform" uiPlatform [
|
||||
"gnome"
|
||||
"qt"
|
||||
];
|
||||
|
||||
buildDotnetModule rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parabolic";
|
||||
version = "2024.5.0";
|
||||
version = "2025.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NickvisionApps";
|
||||
repo = "Parabolic";
|
||||
rev = version;
|
||||
hash = "sha256-awbCn7W7RUSuEByXxLGrsmYjmxCrwywhhrMJq/iM1Uc=";
|
||||
fetchSubmodules = true;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-B8/e5urhy5tAgHNd/PR3HlNQd0M0CxgC56nArFGlQ9c=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||
pythonEnv = python3.withPackages(ps: with ps; [ yt-dlp ]);
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
gettext
|
||||
ninja
|
||||
pkg-config
|
||||
itstool
|
||||
yelp-tools
|
||||
]
|
||||
++ lib.optionals (uiPlatform == "gnome") [
|
||||
wrapGAppsHook4
|
||||
blueprint-compiler
|
||||
glib
|
||||
shared-mime-info
|
||||
]
|
||||
++ lib.optional (uiPlatform == "qt") qt6.wrapQtAppsHook;
|
||||
|
||||
projectFile = "NickvisionTubeConverter.GNOME/NickvisionTubeConverter.GNOME.csproj";
|
||||
nugetDeps = ./deps.json;
|
||||
executables = "NickvisionTubeConverter.GNOME";
|
||||
buildInputs =
|
||||
[
|
||||
libnick
|
||||
boost
|
||||
]
|
||||
++ lib.optionals (uiPlatform == "qt") [
|
||||
qt6.qtbase
|
||||
qt6.qtsvg
|
||||
]
|
||||
++ lib.optionals (uiPlatform == "gnome") [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
libxmlxx5
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
glib
|
||||
shared-mime-info
|
||||
gdk-pixbuf
|
||||
blueprint-compiler
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "UI_PLATFORM" uiPlatform)
|
||||
];
|
||||
|
||||
buildInputs = [ gtk4 libadwaita ];
|
||||
preFixup =
|
||||
lib.optionalString (uiPlatform == "gnome") "gappsWrapperArgs"
|
||||
+ lib.optionalString (uiPlatform == "qt") "qtWrapperArgs"
|
||||
+ "+=(--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
aria2
|
||||
ffmpeg
|
||||
yt-dlp
|
||||
]
|
||||
})";
|
||||
|
||||
runtimeDeps = [
|
||||
gtk4
|
||||
libadwaita
|
||||
glib
|
||||
gdk-pixbuf
|
||||
];
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace NickvisionTubeConverter.Shared/Linux/org.nickvision.tubeconverter.desktop.in --replace '@EXEC@' "NickvisionTubeConverter.GNOME"
|
||||
'';
|
||||
meta = {
|
||||
description = "Graphical frontend for yt-dlp to download video and audio";
|
||||
longDescription = ''
|
||||
Parabolic is a user-friendly frontend for `yt-dlp` that supports
|
||||
many features including but limited to:
|
||||
- Downloading and converting videos and audio using ffmpeg.
|
||||
- Supporting multiple codecs.
|
||||
- Offering YouTube sponsorblock support.
|
||||
- Running multiple downloads at a time.
|
||||
- Downloading metadata and video subtitles.
|
||||
- Allowing the use of `aria2` for parallel downloads.
|
||||
- Offering a graphical keyring to manage account credentials.
|
||||
- Being available as both a Qt and GNOME application.
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 NickvisionTubeConverter.Shared/Resources/org.nickvision.tubeconverter.svg -t $out/share/icons/hicolor/scalable/apps/
|
||||
install -Dm444 NickvisionTubeConverter.Shared/Resources/org.nickvision.tubeconverter-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/
|
||||
install -Dm444 NickvisionTubeConverter.Shared/Linux/org.nickvision.tubeconverter.desktop.in -T $out/share/applications/org.nickvision.tubeconverter.desktop
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ pythonEnv ffmpeg ]}" ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Download web video and audio";
|
||||
By default, the GNOME interface is used, but the Qt interface
|
||||
can be built by overriding the `uiPlatform` argument to `"qt"`
|
||||
over the default value `"gnome"`.
|
||||
'';
|
||||
homepage = "https://github.com/NickvisionApps/Parabolic";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ewuuwe ];
|
||||
mainProgram = "NickvisionTubeConverter.GNOME";
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
normalcea
|
||||
getchoo
|
||||
];
|
||||
mainProgram = "org.nickvision.tubeconverter";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
|
||||
#shellcheck shell=bash
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
|
||||
https://api.github.com/repos/NickvisionApps/Parabolic/releases/latest | jq -e -r .tag_name)
|
||||
old_version=$(nix-instantiate --eval -A parabolic.version | jq -e -r)
|
||||
|
||||
if [[ $version == "$old_version" ]]; then
|
||||
echo "New version same as old version, nothing to do." >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version parabolic "$version"
|
||||
|
||||
$(nix-build -A parabolic.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix"
|
||||
@@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-H446qXFwRGippLMZemkW8sVhTV3YGpKmAvD8QBamAlo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PK6x7xRUSbOFEAhw22T/zbMlqcS5ZQd2bpMp9OFIiUc=";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sqhB2Lj3RK1OyXy87Be9aOkfcksqz+5VfRTlKuswerU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@@ -20,7 +20,8 @@ rustPlatform.buildRustPackage {
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dboKZuY6mlFZu/xCoLXFJ4ARXyYs5/yOYeGkAnUKRX4=";
|
||||
};
|
||||
cargoHash = "sha256-3+jTzYwu9eHji8o4abLiiJGXtZYPfXtXeiZEZajxrVo=";
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-/J+11PRCWn0rzq3nILJYd3V8cxmwDegArUDp8i5rsTY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
{
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
dlib,
|
||||
python,
|
||||
pytestCheckHook,
|
||||
more-itertools,
|
||||
sse4Support ? stdenv.hostPlatform.sse4_1Support,
|
||||
avxSupport ? stdenv.hostPlatform.avxSupport,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (dlib)
|
||||
stdenv
|
||||
pname
|
||||
version
|
||||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
cmakeFlags
|
||||
passthru
|
||||
meta
|
||||
;
|
||||
|
||||
@@ -34,10 +33,26 @@ buildPythonPackage {
|
||||
--replace "pytest==3.8" "pytest"
|
||||
'';
|
||||
|
||||
setupPyBuildFlags = [
|
||||
"--set USE_SSE4_INSTRUCTIONS=${if sse4Support then "yes" else "no"}"
|
||||
"--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}"
|
||||
];
|
||||
# Pass CMake flags through to the build script
|
||||
preConfigure = ''
|
||||
for flag in $cmakeFlags; do
|
||||
if [[ "$flag" == -D* ]]; then
|
||||
setupPyBuildFlags+=" --set ''${flag#-D}"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
doCheck =
|
||||
!(
|
||||
# The tests attempt to use CUDA on the build platform.
|
||||
# https://github.com/NixOS/nixpkgs/issues/225912
|
||||
dlib.cudaSupport
|
||||
|
||||
# although AVX can be enabled, we never test with it. Some Hydra machines
|
||||
# fail because of this, however their build results are probably used on hardware
|
||||
# with AVX support.
|
||||
|| dlib.avxSupport
|
||||
);
|
||||
}
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvidia-ml-py";
|
||||
version = "12.560.30";
|
||||
version = "12.570.86";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "tar.gz";
|
||||
hash = "sha256-8CVNx0AGR2gKBy7gJQm/1GECtgvf7KMhV21NSBfn/pc=";
|
||||
pname = "nvidia_ml_py";
|
||||
inherit version;
|
||||
hash = "sha256-BQjUoMe20BXPV0UwuVpi7U/InaO4tH4a7+Z3fbFw7Is=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/include/server/server.hpp b/include/server/server.hpp
|
||||
index 34b8982e67a..02b0dda050d 100644
|
||||
--- a/include/server/server.hpp
|
||||
+++ b/include/server/server.hpp
|
||||
@@ -53,8 +53,7 @@ class Server
|
||||
const auto port_string = std::to_string(port);
|
||||
|
||||
boost::asio::ip::tcp::resolver resolver(io_context);
|
||||
- boost::asio::ip::tcp::resolver::query query(address, port_string);
|
||||
- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
|
||||
+ boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(address, port_string).begin();
|
||||
|
||||
acceptor.open(endpoint.protocol());
|
||||
#ifdef SO_REUSEPORT
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
@@ -16,7 +15,7 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "osrm-backend";
|
||||
version = "5.27.1-unstable-2024-11-03";
|
||||
|
||||
@@ -27,6 +26,11 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-iix++G49cC13wZGZIpXu1SWGtVAcqpuX3GhsIaETzUU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Taken from https://github.com/Project-OSRM/osrm-backend/pull/7073.
|
||||
./boost187-compat.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -298,6 +298,7 @@ mapAliases {
|
||||
dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
|
||||
dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself.";
|
||||
dat = nodePackages.dat;
|
||||
dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03
|
||||
dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
|
||||
dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
|
||||
deadpixi-sam = deadpixi-sam-unstable;
|
||||
|
||||
Reference in New Issue
Block a user