gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-23 06:01:36 +00:00
committed by GitHub
parent cee7ce609d 010946fcbd
commit 36f198081c
58 changed files with 768 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+18
View File
@@ -2442,6 +2442,12 @@
githubId = 5394722;
name = "Spencer Baugh";
};
cathalmullan = {
email = "contact@cathal.dev";
github = "CathalMullan";
githubId = 37139470;
name = "Cathal Mullan";
};
catouc = {
email = "catouc@philipp.boeschen.me";
github = "catouc";
@@ -9003,6 +9009,12 @@
githubId = 1238350;
name = "Matthias Herrmann";
};
mahmoudk1000 = {
email = "mahmoudk1000@gmail.com";
github = "mahmoudk1000";
githubId = 24735185;
name = "Mahmoud Ayman";
};
majesticmullet = {
email = "hoccthomas@gmail.com.au";
github = "MajesticMullet";
@@ -14815,6 +14827,12 @@
githubId = 1634990;
name = "Tom McLaughlin";
};
thornycrackers = {
email = "codyfh@gmail.com";
github = "thornycrackers";
githubId = 4313010;
name = "Cody Hiar";
};
thoughtpolice = {
email = "aseipp@pobox.com";
github = "thoughtpolice";
nixos/modules/installer/sd-card/sd-image-powerpc64le.nix
+49
View File
@@ -0,0 +1,49 @@
# To build, use:
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-powerpc64le.nix -A config.system.build.sdImage
{ config, lib, pkgs, ... }:
{
imports = [
../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
boot.loader = {
# powerpc64le-linux typically uses petitboot
grub.enable = false;
generic-extlinux-compatible = {
# petitboot is not does not support all of the extlinux extensions to
# syslinux, but its parser is very forgiving; it essentially ignores
# whatever it doesn't understand. See below for a filename adjustment.
enable = true;
};
};
boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelParams = [ "console=hvc0" ];
sdImage = {
populateFirmwareCommands = "";
populateRootCommands = ''
mkdir -p ./files/boot
${config.boot.loader.generic-extlinux-compatible.populateCmd} \
-c ${config.system.build.toplevel} \
-d ./files/boot
''
# https://github.com/open-power/petitboot/blob/master/discover/syslinux-parser.c
# petitboot will look in these paths (plus all-caps versions of them):
# /boot/syslinux/syslinux.cfg
# /syslinux/syslinux.cfg
# /syslinux.cfg
+ ''
mv ./files/boot/extlinux ./files/boot/syslinux
mv ./files/boot/syslinux/extlinux.conf ./files/boot/syslinux/syslinux.cfg
''
# petitboot does not support relative paths for LINUX or INITRD; it prepends
# a `/` when parsing these fields
+ ''
sed -i 's_^\(\W\W*\(INITRD\|initrd\|LINUX\|linux\)\W\)\.\./_\1/boot/_' ./files/boot/syslinux/syslinux.cfg
'';
};
}
nixos/modules/services/networking/imaginary.nix
+6 -3
View File
@@ -10,9 +10,12 @@ in {
address = mkOption {
type = types.str;
default = "";
description = mdDoc "Bind address. Corresponds to the `-a` flag.";
example = "localhost";
default = "localhost";
description = mdDoc ''
Bind address. Corresponds to the `-a` flag.
Set to `""` to bind to all addresses.
'';
example = "[::1]";
};
port = mkOption {
nixos/modules/services/web-apps/alps.nix
+1 -1
View File
@@ -84,7 +84,7 @@ in {
"-addr" "${cfg.bindIP}:${toString cfg.port}"
"-theme" "${cfg.theme}"
"imaps://${cfg.imaps.host}:${toString cfg.imaps.port}"
"smpts://${cfg.smtps.host}:${toString cfg.smtps.port}"
"smtps://${cfg.smtps.host}:${toString cfg.smtps.port}"
];
};
};
pkgs/applications/audio/spotify-player/default.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
version = "0.11.1";
version = "0.12.0";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iaDaPjh2wZXxBxBDhWp+hHrJZyXqw6HSzgCzbZj9iho=";
sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio=";
};
cargoHash = "sha256-I8n/fR1aOsSex2p0u5FaqoJCh2J0oMxkikS9aynxgpA=";
cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ=";
nativeBuildInputs = [
pkg-config
pkgs/applications/graphics/rnote/default.nix
+3 -3
View File
@@ -23,19 +23,19 @@
stdenv.mkDerivation rec {
pname = "rnote";
version = "0.5.13";
version = "0.5.14";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
hash = "sha256-8HMaCO+v9PbkoS8Z1BmndiU7UmlG4TT0+bSESIwa3RM=";
hash = "sha256-55hB8UyK+EPJ6/Yj5yNK6endNU9Ux/kZmQNjcrYq6KU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-rXAPILGzLZ3Ne4nhdaPZH1R2ezaF+D/P2t/Sod6nxo8=";
hash = "sha256-NPRImc0nVhYgq9JfGoSM1mT1Z6KQjVWgoLIagOUCM5M=";
};
nativeBuildInputs = [
pkgs/applications/misc/calibre/default.nix
-2
View File
@@ -58,8 +58,6 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \
setup/build.py
sed -i "s/\[tool.sip.bindings.pictureflow\]/[tool.sip.bindings.pictureflow]\ntags = [\"${python3Packages.sip.platform_tag}\"]/g" \
setup/build.py
# Remove unneeded files and libs
rm -rf src/odf resources/calibre-portable.*
pkgs/applications/misc/metadata-cleaner/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "metadata-cleaner";
version = "2.4.0";
version = "2.5.0";
format = "other";
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "rmnvgr";
repo = pname;
rev = "v${version}";
hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs=";
hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA=";
};
nativeBuildInputs = [
pkgs/applications/misc/obsidian/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "1.1.9";
version = "1.1.15";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-dFR7LaDRJwpxrNyPNseGi66gIAHOKf5Au2VXl7SBGSE=";
sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao=";
};
icon = fetchurl {
pkgs/applications/misc/watchmate/default.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchmate";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "azymohliad";
repo = "watchmate";
rev = "v${version}";
hash = "sha256-WRoAQDOsCi9VbshGzdw+qrVFKQhOQwPgxOfWXYJ3nhg=";
hash = "sha256-JPlydIMkWhmHqGeeKfoc+0lK2X6B3j3Z34YrD29rrXs=";
};
cargoHash = "sha256-pEXC5IVcMhqYM+bGyTh/vaSS9LxYE2YbtIaPplc4Al8=";
cargoHash = "sha256-cAXJrhWD/uOlKWvFU947EGC9A9qwquwiVG0x1u1We6o=";
nativeBuildInputs = [
pkg-config
pkgs/applications/misc/xmrig/moneroocean.nix
+1 -2
View File
@@ -12,11 +12,10 @@ xmrig.overrideAttrs (oldAttrs: rec {
};
meta = with lib; {
broken = stdenv.isDarwin;
description = "A fork of the XMRig CPU miner with support for algorithm switching";
homepage = "https://github.com/MoneroOcean/xmrig";
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = platforms.unix;
maintainers = with maintainers; [ j0hax ];
};
})
pkgs/applications/networking/cluster/terraform-providers/providers.json
+21 -21
View File
@@ -82,13 +82,13 @@
"vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ="
},
"auth0": {
"hash": "sha256-3iB/Vcv6Vzs9teulhu0npl6IuIJRsKy8FkBcIPTKw8A=",
"hash": "sha256-3hAfDzK7iO4D68OsCvuXQx5Gk0VOtoBiw21tBJjDJtQ=",
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
"owner": "auth0",
"repo": "terraform-provider-auth0",
"rev": "v0.43.0",
"rev": "v0.44.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw="
"vendorHash": "sha256-UP9A0lcW5QbTuur1MMjKMlvC8S3nenqs0WjpoqvwEQI="
},
"avi": {
"hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=",
@@ -237,13 +237,13 @@
"vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA="
},
"cloudinit": {
"hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=",
"hash": "sha256-Ojr/qxfaj78Wfro5NZSoavW+FfByIi+P98RNxmG/1ao=",
"homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit",
"owner": "hashicorp",
"repo": "terraform-provider-cloudinit",
"rev": "v2.2.0",
"rev": "v2.3.1",
"spdx": "MPL-2.0",
"vendorHash": null
"vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s="
},
"cloudscale": {
"hash": "sha256-DQ7yIqA9gII0Ub1C8DEa1AMhQbzRFvsng8TMBGz+qzg=",
@@ -429,21 +429,21 @@
"vendorHash": null
},
"gitlab": {
"hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=",
"hash": "sha256-nBmb+wHl6FEHIH/P9SsDCtvDKVHzcL4/iaQwtuSjbVg=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
"rev": "v15.8.0",
"rev": "v15.9.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE="
"vendorHash": "sha256-yK2M07+FmMEE9YuCJk86qLncHr2ToeZQAzWRQz1lLNM="
},
"google": {
"hash": "sha256-WE1UjyqsrhlGWJHZ6VlNCBtdSsXM6ewK4WJrmqFN6NU=",
"hash": "sha256-sFfL/PcX5a2tWKo3VxGCM8pJUH18Up70Y/1NXgvNgRw=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.53.1",
"rev": "v4.54.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
},
@@ -503,11 +503,11 @@
"vendorHash": null
},
"heroku": {
"hash": "sha256-Fc8nCrFR3cHEN68y277/eZ6DLVfFxEyliCkii5343MI=",
"hash": "sha256-HRwG8VNl13HdibczNDWiCS74vrRImM/g3zn4MgQQx3s=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
"rev": "v5.1.11",
"rev": "v5.1.12",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -811,11 +811,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
"hash": "sha256-JkJEghLvttmQ1Hc9s8fbUXa/onDNuKDBb0k1gXD373s=",
"hash": "sha256-6UVsSOAh/JigJkiK+RbHsv7t/IuejouaRL+o8F0ndAo=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v4.108.1",
"rev": "v4.109.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -874,11 +874,11 @@
"vendorHash": null
},
"ovh": {
"hash": "sha256-xims3nYFVSS38FIMJhUhtK7lKpnRzzlojYZY6t57owA=",
"hash": "sha256-d/G2o1G0cdb5shSv1WG7YBbhNift2sKjUd/Cz9XgvJ8=",
"homepage": "https://registry.terraform.io/providers/ovh/ovh",
"owner": "ovh",
"repo": "terraform-provider-ovh",
"rev": "v0.27.0",
"rev": "v0.28.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -964,11 +964,11 @@
"vendorHash": null
},
"scaleway": {
"hash": "sha256-HpdXghgEZ3UAv+njHQws1/f23tKquWwafO/O9X29c1M=",
"hash": "sha256-sUYRsh1t4y9SNdt0QzhP1BM3CglxYy/ciZAEGCLj7c8=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.11.0",
"rev": "v2.11.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-e/Pqu58ngWnoMKjDKEUm49e0D0PfYEqxm/BxfN8UX3c="
},
@@ -1218,11 +1218,11 @@
"vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE="
},
"vra7": {
"hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=",
"hash": "sha256-J+lhKDl8CGpDgdfuv0uWd7yDNiwrWAzoXCxkEidqJH4=",
"homepage": "https://registry.terraform.io/providers/vmware/vra7",
"owner": "vmware",
"repo": "terraform-provider-vra7",
"rev": "v3.0.6",
"rev": "v3.0.7",
"spdx": "MPL-2.0",
"vendorHash": null
},
pkgs/applications/science/electronics/flatcam/default.nix
+29 -3
View File
@@ -1,10 +1,36 @@
{ lib
, python3Packages
, stdenv
, python3
, fetchFromBitbucket
, fetchpatch
, substituteAll
, geos
}:
python3Packages.buildPythonApplication rec {
let
python = python3.override {
packageOverrides = self: super: {
shapely = super.shapely.overridePythonAttrs (old: rec {
version = "1.8.4";
src = self.fetchPypi {
pname = "Shapely";
inherit version;
hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw=";
};
# Environment variable used in shapely/_buildcfg.py
GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
patches = [
# Patch to search form GOES .so/.dylib files in a Nix-aware way
(substituteAll {
src = ./shapely-library-paths.patch;
libgeos_c = GEOS_LIBRARY_PATH;
libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
})
];
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "flatcam";
version = "8.5";
@@ -15,7 +41,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m";
};
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = with python.pkgs; [
matplotlib
numpy
packaging
pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch
+31
View File
@@ -0,0 +1,31 @@
diff --git a/shapely/geos.py b/shapely/geos.py
index 88c5f53..1ccd6e4 100644
--- a/shapely/geos.py
+++ b/shapely/geos.py
@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'):
alt_paths = [
'libgeos_c.so.1',
'libgeos_c.so',
+ '@libgeos_c@',
]
_lgeos = load_dll('geos_c', fallbacks=alt_paths)
@@ -160,6 +161,7 @@ elif sys.platform == 'darwin':
"/usr/local/lib/libgeos_c.dylib",
# homebrew Apple Silicon
"/opt/homebrew/lib/libgeos_c.dylib",
+ "@libgeos_c@",
]
_lgeos = load_dll('geos_c', fallbacks=alt_paths)
diff --git a/tests/test_dlls.py b/tests/test_dlls.py
index c71da8e..c36262c 100644
--- a/tests/test_dlls.py
+++ b/tests/test_dlls.py
@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase):
'/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS)
os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux)
'libgeos_c.so.1',
- 'libgeos_c.so'])
+ 'libgeos_c.so',
+ '@libgeos_c@'])
pkgs/applications/science/logic/abc/default.nix
+3 -3
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "abc-verifier";
version = "unstable-2022-11-09";
version = "unstable-2023-02-04";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "abc";
rev = "be9a35c0363174a7cef21d55ed80d92a9ef95ab1";
hash = "sha256-IN9YgJONcC55N89OXMrMuNuznTdjXNWxR0IngH8OWC8=";
rev = "a8f0ef2368aa56b3ad20a52298a02e63b2a93e2d";
hash = "sha256-48i6AKQhMG5hcnkS0vejOy1PqFbeb6FpU7Yx0rEvHDI=";
};
nativeBuildInputs = [ cmake ];
pkgs/applications/version-management/gitkraken/default.nix
+4 -4
View File
@@ -10,24 +10,24 @@ with lib;
let
pname = "gitkraken";
version = "9.1.0";
version = "9.1.1";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-HRd2jfTbdFKVMbnD4CzMsE22urExGrpf8rgli3dqVUY=";
sha256 = "sha256-CbIKdErthpMnVIuv+EJsWBRixMDG8h9aQ2XcmqpzKUc=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-zJEjJ+l0/S8B2b7mlDd2sln8GsvCaZZIcarC45rLATQ=";
sha256 = "sha256-J6ruK1UE0A9VG1tUHeSUDEL4wqRmUnOH8ftKHIIQuVc=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-5wep4FDNZwNOK05tm24132JuyBWUJRyeRpJDF7PLYoQ=";
sha256 = "sha256-cjz/pbV+uV6tbhj3NXDfZ93hgxFtNYhFIh6+jG4pFtU=";
};
};
pkgs/applications/version-management/yadm/default.nix
+2 -2
View File
@@ -29,7 +29,7 @@ to support their use in yadm.
resholve.mkDerivation rec {
pname = "yadm";
version = "3.2.1";
version = "3.2.2";
nativeBuildInputs = [ installShellFiles ];
@@ -37,7 +37,7 @@ resholve.mkDerivation rec {
owner = "TheLocehiliosan";
repo = "yadm";
rev = version;
hash = "sha256:0h3gxhdf32g21xx9si0lv0sa4ipb1k0n5qpln0w2vipvfgakn5mn";
hash = "sha256-GcuqMlE8oef9+LIqKoCotktU7GcgPBE9CTVrZ8bKhv4=";
};
dontConfigure = true;
pkgs/desktops/deepin/apps/deepin-camera/default.nix
+95
View File
@@ -0,0 +1,95 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, qttools
, wrapQtAppsHook
, dtkwidget
, qt5integration
, qt5platform-plugins
, image-editor
, qtbase
, qtmultimedia
, ffmpeg
, ffmpegthumbnailer
, libusb1
, portaudio
, libv4l
, gst_all_1
, systemd
}:
stdenv.mkDerivation rec {
pname = "deepin-camera";
version = "1.4.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-p2RCetx1lgLonXZaC3umE+nDgZnp64o3iR2MgQhbisM=";
};
# QLibrary and dlopen work with LD_LIBRARY_PATH
patches = [ ./dont_use_libPath.diff ];
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace "/usr/share/libimagevisualresult/filter_cube" "${image-editor}/share/libimagevisualresult/filter_cube" \
--replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0"
substituteInPlace src/com.deepin.Camera.service \
--replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \
--replace "/usr/share/applications/deepin-camera.desktop" "$out/share/applications/deepin-camera.desktop"
'';
nativeBuildInputs = [
cmake
pkg-config
qttools
wrapQtAppsHook
];
buildInputs = [
dtkwidget
qt5platform-plugins
image-editor
qtbase
qtmultimedia
ffmpeg
ffmpegthumbnailer
libusb1
portaudio
libv4l
] ++ (with gst_all_1 ; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
]);
cmakeFlags = [ "-DVERSION=${version}" ];
NIX_CFLAGS_COMPILE = [
"-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
];
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}"
];
preFixup = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'';
meta = with lib; {
description = "Tool to view camera, take photo and video";
homepage = "https://github.com/linuxdeepin/deepin-camera";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
};
}
pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff
+25
View File
@@ -0,0 +1,25 @@
diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp
index d3c6f5c..4817446 100644
--- a/src/src/mainwindow.cpp
+++ b/src/src/mainwindow.cpp
@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog()
QString CMainWindow::libPath(const QString &strlib)
{
- QDir dir;
- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
- dir.setPath(path);
- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib
-
- if (list.contains(strlib))
- return strlib;
-
- list.sort();
- if (list.size() > 0)
- return list.last();
-
- return "";
+ return strlib;
}
void CMainWindow::reflushSnapshotLabel()
pkgs/desktops/deepin/default.nix
+1
View File
@@ -37,6 +37,7 @@ let
#### Dtk Application
deepin-album = callPackage ./apps/deepin-album { };
deepin-calculator = callPackage ./apps/deepin-calculator { };
deepin-camera = callPackage ./apps/deepin-camera { };
deepin-compressor = callPackage ./apps/deepin-compressor { };
deepin-draw = callPackage ./apps/deepin-draw { };
deepin-editor = callPackage ./apps/deepin-editor { };
pkgs/development/compilers/cudatoolkit/common.nix
+7
View File
@@ -229,6 +229,13 @@ stdenv.mkDerivation rec {
addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/*
addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/x86/*
addOpenGLRunpath $out/target-linux-x64/*
'' +
# Prune broken symlinks which can cause problems with consumers of this package.
''
while read -r -d "" file; do
echo "Found and removing broken symlink $file"
rm "$file"
done < <(find "$out" "$lib" "$doc" -xtype l -print0)
'';
# cuda-gdb doesn't run correctly when not using sandboxing, so
pkgs/development/compilers/yosys/default.nix
+2 -2
View File
@@ -71,13 +71,13 @@ let
in stdenv.mkDerivation rec {
pname = "yosys";
version = "0.25";
version = "0.26";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "${pname}-${version}";
hash = "sha256-hOuuKvT6ZM7G0HTGtVeEHHfJWqwUinD+DxT3r0CQZH0=";
hash = "sha256-0xV+323YTK+VhnD05SmvGv8uT4TzqA9IZ/iKl1as1Kc=";
};
enableParallelBuilding = true;
pkgs/development/libraries/folly/default.nix
+2 -2
View File
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2023.02.06.00";
version = "2023.02.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-37BoLs7LynuMuF7cdJtVOfZSs22PZr6DYNAVwigZghw=";
sha256 = "sha256-YKS+UIlgDhMefovkkR/GlJcZtAjGLC9e8uhqfniH1eY=";
};
nativeBuildInputs = [
pkgs/development/libraries/lief/default.nix
+1 -1
View File
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
description = "Library to Instrument Executable Formats";
homepage = "https://lief.quarkslab.com/";
license = [ licenses.asl20 ];
platforms = platforms.linux;
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.lassulus ];
};
}
pkgs/development/python-modules/aioesphomeapi/default.nix
+2 -7
View File
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "13.3.1";
version = "13.4.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -21,14 +21,9 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Pca+SMuUL3XyQpLAL6SOYPnztc95WF2o0v4+5Nc5Nxg=";
hash = "sha256-auqG+2Y+Dgwtkwbidi430n4t+GnZlBHIPUmsfl1aPa0=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "protobuf>=3.12.2,<4.0" "protobuf>=3.12.2"
'';
propagatedBuildInputs = [
noiseprotocol
protobuf
pkgs/development/python-modules/bitstruct/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "bitstruct";
version = "8.15.1";
version = "8.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-b6atv7jzuMtowhsTqmXSPrLDrDJBmrkm8/0f/3F6kSU=";
hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ=";
};
pythonImportsCheck = [
pkgs/development/python-modules/hass-nabucasa/default.nix
-2
View File
@@ -1,7 +1,6 @@
{ lib
, acme
, aiohttp
, asynctest
, atomicwrites-homeassistant
, attrs
, buildPythonPackage
@@ -44,7 +43,6 @@ buildPythonPackage rec {
doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0";
nativeCheckInputs = [
asynctest
pytest-aiohttp
pytestCheckHook
];
pkgs/development/python-modules/httpx-ntlm/default.nix
+2 -10
View File
@@ -1,6 +1,5 @@
{ lib
, buildPythonPackage
, cryptography
, fetchPypi
, httpx
, pyspnego
@@ -9,7 +8,7 @@
buildPythonPackage rec {
pname = "httpx-ntlm";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,21 +16,14 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "httpx_ntlm";
inherit version;
hash = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ=";
hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I=";
};
propagatedBuildInputs = [
cryptography
httpx
pyspnego
];
postPatch = ''
substituteInPlace setup.py \
--replace "pyspnego==0.3.*" "pyspnego>=0.3.*" \
--replace "cryptography==36.0.*" "cryptography>=36.0.*"
'';
# https://github.com/ulodciv/httpx-ntlm/issues/5
doCheck = false;
pkgs/development/python-modules/losant-rest/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "losant-rest";
version = "1.17.1";
version = "1.17.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Losant";
repo = "losant-rest-python";
rev = "v${version}";
hash = "sha256-H0dGPcGSiV8fZwZRGWIx39ObriPmsr1pZaFkSsXrTQA=";
hash = "sha256-R17pMVK0T2LLQPNX7mwIlkmuRyNs8rx0sJZa8F60mvs=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/meteofrance-api/default.nix
+5 -3
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "meteofrance-api";
version = "1.1.0";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "hacf-fr";
repo = pname;
rev = "v${version}";
hash = "sha256-1ZN/9ur6uhK7M5TurmmWgUjzkc79MPqKnT637hbAAWA=";
rev = "refs/tags/v${version}";
hash = "sha256-W26R+L2ZJpycEQ9KwkHqVARKsd/5YkJCxMeciKnKAX8=";
};
nativeBuildInputs = [
@@ -56,12 +56,14 @@ buildPythonPackage rec {
"test_places"
"test_rain"
"test_session"
"test_observation"
"test_workflow"
];
meta = with lib; {
description = "Module to access information from the Meteo-France API";
homepage = "https://github.com/hacf-fr/meteofrance-api";
changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/mox/default.nix
-41
View File
@@ -1,41 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "mox";
version = "0.7.8";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ivancrneto";
repo = "pymox";
rev = "v${version}";
hash = "sha256-gODE9IGDk3WtO8iPOlp98fGp6Ih2laA3YlOHmq62m8Y=";
};
propagatedBuildInputs = [
six
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"mox"
];
meta = with lib; {
description = "Mock object framework";
homepage = "https://github.com/ivancrneto/pymox";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
}
pkgs/development/python-modules/pyqt/5.x.nix
+2 -2
View File
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "PyQt5";
version = "5.15.7";
version = "5.15.9";
format = "pyproject";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ=";
hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA=";
};
patches = [
pkgs/development/python-modules/pyqt/6.x.nix
+2 -2
View File
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "PyQt6";
version = "6.4.0";
version = "6.4.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kTkkab4fSRkF+p54+k5AWaiathbd8uz9UlvB1lwmu5M=";
hash = "sha256-dAJE9gj+Fe4diWlcQ/MaFMrspBxPAqw2yG37pKXVgT0=";
};
patches = [
pkgs/development/python-modules/python-box/default.nix
+3 -14
View File
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, msgpack
, poetry-core
, pytestCheckHook
@@ -16,8 +15,8 @@
buildPythonPackage rec {
pname = "python-box";
version = "7.0.0";
format = "pyproject";
version = "7.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -25,20 +24,10 @@ buildPythonPackage rec {
owner = "cdgriffith";
repo = "Box";
rev = "refs/tags/${version}";
hash = "sha256-CvcVN5DTaT8mSf2FtFrt7DHP+YLbVI15/5Vjfmgae34=";
hash = "sha256-Ddt8/S6HzmOt1kvzRzed3+TbOacw6RG9nd2UNn+ELB4=";
};
patches = [
# Switch to poetry-core, https://github.com/cdgriffith/Box/pull/247
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/cdgriffith/Box/commit/a43b98c5f5ff1074568dcef27cf17e7065d1019c.patch";
hash = "sha256-ul/MVSzgjN3D+Vuzn7YPITaDrtS58vDmA23hy1EVF9U=";
})
];
nativeBuildInputs = [
poetry-core
setuptools
];
pkgs/development/python-modules/python-jwt/default.nix
+47
View File
@@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, cryptography
, freezegun
, pytestCheckHook
, pytest-cov
}:
buildPythonPackage rec {
pname = "jwt";
version = "1.3.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
inherit version;
owner = "GehirnInc";
repo = "python-jwt";
rev = "v${version}";
sha256 = "sha256-N1J8yBVX/O+92cRp+q2gA2cFsd+C7JjUR9jo0VGoINg=";
};
postPatch = ''
# pytest-flake8 is incompatible flake8 6.0.0 and currently unmaintained
substituteInPlace setup.cfg --replace "--flake8" ""
'';
propagatedBuildInputs = [
cryptography
];
nativeCheckInputs = [
pytestCheckHook
freezegun
pytest-cov
];
pythonImportsCheck = [ "jwt" ];
meta = with lib; {
description = "JSON Web Token library for Python 3";
homepage = "https://github.com/GehirnInc/python-jwt";
license = licenses.asl20;
maintainers = with maintainers; [ thornycrackers ];
};
}
pkgs/development/python-modules/recurring-ical-events/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "recurring-ical-events";
version = "2.0.1";
version = "2.0.2";
format = "setuptools";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "niccokunzmann";
repo = "python-recurring-ical-events";
rev = "v${version}";
hash = "sha256-1tmUf0HIKufiocAZPxkTLyicMU0o8dhSjCij2Lc/lyk=";
hash = "sha256-aM7c/HE8xLqT5wCLaCrfFn6c7FIkCJA6TTICZprAgNM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/reolink-aio/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.4.2";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-7XD8nmuja8BL66OCdflKWiKyR47TRXUjJLSmcgqSl8g=";
hash = "sha256-6fG7wKanw/ECsO7tqT69iTRjhhUpS2lKXMvW9FiqSi8=";
};
postPatch = ''
pkgs/development/python-modules/sip/default.nix
+20 -19
View File
@@ -1,34 +1,35 @@
{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }:
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, setuptools
, wheel
, packaging
, ply
, toml
}:
buildPythonPackage rec {
pname = "sip";
version = "6.7.5";
version = "6.7.7";
format = "pyproject";
src = fetchPypi {
pname = "sip";
inherit version;
sha256 = "sha256-llXQieHQxfv2a94RVYqHSYBykTK1vQwq41WsGnuJOrQ=";
inherit pname version;
hash = "sha256-3unAb6iubUQaQB+SKGf8YZbt2idO69n7/sVPB2nCqeI=";
};
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [ packaging ply toml ];
# There aren't tests
doCheck = false;
# FIXME: Why isn't this detected automatically?
# Needs to be specified in pyproject.toml, e.g.:
# [tool.sip.bindings.MODULE]
# tags = [PLATFORM_TAG]
platform_tag =
if stdenv.targetPlatform.isLinux then
"WS_X11"
else if stdenv.targetPlatform.isDarwin then
"WS_MACX"
else if stdenv.targetPlatform.isWindows then
"WS_WIN"
else
throw "unsupported platform";
pythonImportsCheck = [ "sipbuild" ];
meta = with lib; {
pkgs/development/python-modules/vallox-websocket-api/default.nix
+7 -5
View File
@@ -5,22 +5,22 @@
, setuptools
, construct
, websockets
, asynctest
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "vallox-websocket-api";
version = "3.0.0";
version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "yozik04";
repo = "vallox_websocket_api";
rev = "refs/tags/${version}";
hash = "sha256-iy5ipW7ldvLWhfxgPlWcsFeKrAXqtyypveAX74u8zmo=";
hash = "sha256-JbTuBzRSgMTPSgWEEAJGc8R44VLHiMr4qocbBjpJBmk=";
};
nativeBuildInputs = [
@@ -33,10 +33,12 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
asynctest
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "vallox_websocket_api" ];
meta = {
description = "Async API for Vallox ventilation units";
homepage = "https://github.com/yozik04/vallox_websocket_api";
pkgs/development/tools/ameba/default.nix
+4 -3
View File
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "ameba";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "crystal-ameba";
repo = "ameba";
rev = "v${version}";
hash = "sha256-9dMzT/SnO16jfUfYYiT4MOGnlgrw0jWTNL37u1Y5oBI=";
rev = "refs/tags/v${version}";
hash = "sha256-UNMOLbZeSdvTuDgveQ/vRC+PlAdVo1bGnpMz3g1seY8=";
};
format = "make";
@@ -16,6 +16,7 @@ crystal.buildCrystalPackage rec {
meta = with lib; {
description = "A static code analysis tool for Crystal";
homepage = "https://crystal-ameba.github.io";
changelog = "https://github.com/crystal-ameba/ameba/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ kimburgess ];
};
pkgs/development/tools/build-managers/bear/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "bear";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "rizsotto";
repo = pname;
rev = version;
sha256 = "sha256-b9QeXUdvXoJNFxi7i2IVq7Xeyo5T54A0Sl9BvAV25JM=";
sha256 = "sha256-EiAGM2tfzHp2rTAsf+mrfQ7VfX0NTFakcLVpT/plqh8=";
};
nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/tools/build-managers/gradle/default.nix
+2 -2
View File
@@ -134,9 +134,9 @@ rec {
};
gradle_6 = gen {
version = "6.9.3";
version = "6.9.4";
nativeVersion = "0.22-milestone-20";
sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw";
sha256 = "16iqh4bn7ndch51h2lgkdqyyhnd91fdfjx55fa3z3scdacl0491y";
defaultJava = jdk11;
};
}
pkgs/development/tools/devbox/default.nix
+3 -3
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "devbox";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-T1laFLVDtDYOA5x3zWcBU7ae1uN1cQUqLHtY36uEXOI=";
hash = "sha256-Wm8IpXmxBm6Ifh7fV9viKAfIC8BdjN1prpUyeI9eNXE=";
};
ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
# integration tests want file system access
doCheck = false;
vendorHash = "sha256-3u3qg8BojCVp0gx8ZKRv2WS5K307CnTlFjvTgrlfw8w=";
vendorHash = "sha256-5uh1G+puVVG0A1d+R4pZfbv63zyB86ihBjzoT63Xf1s=";
nativeBuildInputs = [ installShellFiles ];
pkgs/development/tools/protoc-gen-connect-go/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "protoc-gen-connect-go";
version = "1.5.0";
version = "1.5.2";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "connect-go";
rev = "refs/tags/v${version}";
hash = "sha256-lk7PcSsqm2oLYerhXGxcyqkw5VJ46JIASU87ppybd78=";
hash = "sha256-tZNMxheADUhHBOKtFBezOYiLWTR0Ztviq05ogh+uwXw=";
};
vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw=";
pkgs/development/tools/rust/cargo-deb/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deb";
version = "1.42.0";
version = "1.42.1";
src = fetchFromGitHub {
owner = "kornelski";
repo = pname;
rev = "v${version}";
hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY=";
hash = "sha256-8o3WQ/kaYhp1gjHLQeDU9JITv9crxAVCP8UReIVd4Fc=";
};
cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao=";
cargoHash = "sha256-EbcH2aBs9haXKBdEWJRPqJ1PSLj3pHdHJi38LH08uTk=";
nativeBuildInputs = [
makeWrapper
pkgs/development/web/flyctl/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.456";
version = "0.0.464";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-RKdw8Yk7G1QhtxYyQtaYS1iKECXxD8kEavzRcvPtmdM=";
hash = "sha256-rfdxOhViYzL+tK4p+8deqLgk81HBFsD17j05mx0Xkrk=";
};
vendorHash = "sha256-57Ccqiuu2KQWdNqzqrmVXf7KnvjUjB9S1TMnDYu6b/I=";
vendorHash = "sha256-sJl6v57/Is3g5EQ6oU/CkoqkXL75U5oUsdLdo8ChfH4=";
subPackages = [ "." ];
pkgs/games/anki/bin.nix
+5 -5
View File
@@ -3,22 +3,22 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.58";
version = "2.1.60";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
sha256 = "sha256-9rlNShbdosCa60f4JlhC14dl3j2DxqFr3GgOOMWdXFY=";
sha256 = "sha256-IXgIVMcaZBTasRteZz3tRaDQ2rsWel2cNondK2VnzTU=";
};
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
sha256 = "sha256-Zp5C9r5uAfIg8szMtpCzWV3N7Em7iYN7WLO6DiEslWc=";
sha256 = "sha256-DQZsKkJ8SMAFpZ2/aVRAigmbsdnW79jW7otPOd8Y/v8=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
sha256 = "sha256-Ssg+SuCYBfaQ+XZP7hnZDD/k5dMduU5oj8H+gP+iPMY=";
sha256 = "sha256-y67nxlsyKT1PuBq8KMh8NatpLViClaN6BIMMoralKdQ=";
};
};
@@ -45,7 +45,7 @@ let
meta = with lib; {
inherit (anki.meta) license homepage description longDescription;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
maintainers = with maintainers; [ atemu ];
maintainers = with maintainers; [ mahmoudk1000 atemu ];
};
passthru = { inherit sources; };
pkgs/servers/monitoring/phlare/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "phlare";
version = "0.3.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "phlare";
sha256 = "sha256-z1PT5chkpHQJPziY7bGf6W1X5uezL6E2GUV6w/NlyFk=";
};
proxyVendor = true;
vendorSha256 = "sha256-KJbh+M9jYxUW9akVBHZoB/mtOHWpMPtlwIgC9fu+NYY=";
ldflags = let
prefix = "github.com/grafana/phlare/pkg/util/build";
in [
"-s" "-w"
# https://github.com/grafana/phlare/blob/v0.3.0/Makefile#L32
"-X ${prefix}.Version=${version}"
"-X ${prefix}.Branch=v${version}"
"-X ${prefix}.Revision=v${version}"
"-X ${prefix}.BuildUser=nix"
"-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
];
subPackages = [
"cmd/phlare"
"cmd/profilecli"
];
meta = with lib; {
description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data.";
license = licenses.agpl3;
homepage = "https://grafana.com/oss/phlare";
maintainers = with maintainers; [ cathalmullan ];
};
}
pkgs/servers/oxigraph/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, IOKit
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "oxigraph";
version = "0.3.11";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-7KbDZKKJPk3QTp4siIbdB6xKbslw73Lhc7NoeOuA0Og=";
fetchSubmodules = true;
};
cargoSha256 = "sha256-Yqn6hwejg6LzcqW0MiUN3tqrOql6cpu/5plaOz+2/ns=";
nativeBuildInputs = [
rustPlatform.bindgenHook
];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ];
cargoBuildFlags = [ "--package" "oxigraph_server" ];
# requires packaging of the associated python modules
doCheck = false;
meta = with lib; {
homepage = "https://github.com/oxigraph/oxigraph";
description = "SPARQL graph database";
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
maintainers = with maintainers; [ astro ];
license = with licenses; [ asl20 mit ];
};
}
pkgs/servers/spicedb/zed.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "zed";
version = "0.8.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "authzed";
repo = "zed";
rev = "v${version}";
hash = "sha256-/tYQqS0l5Z/yeNd6GJHONtD3YeQ7nvvWcilBAahDDPA=";
hash = "sha256-bA9ZIYzt6d0PaIChQcS9uUakxmsx/SElHite6boAd3o=";
};
vendorHash = "sha256-3JQgtWaPi2e9lSXF+3IIXDptQXjFJOBsMPfisEea8kE=";
vendorHash = "sha256-4Y/98VEZWjk2k4UPtGEumOMbjjR4V1OnPvj5mxuX/DQ=";
meta = with lib; {
description = "Command line for managing SpiceDB";
pkgs/tools/misc/0x/Cargo.lock
Generated
+232
View File
@@ -0,0 +1,232 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "approx"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
dependencies = [
"num-traits",
]
[[package]]
name = "argh"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62"
dependencies = [
"argh_derive",
"argh_shared",
]
[[package]]
name = "argh_derive"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc"
dependencies = [
"argh_shared",
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "argh_shared"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "colorous"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "882e392738ed515520f38708166e9efec85ee154f80bf1fc64510e2fc54bf481"
[[package]]
name = "find-crate"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
dependencies = [
"toml",
]
[[package]]
name = "heck"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "num-traits"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
"autocfg",
]
[[package]]
name = "ohx"
version = "0.1.0"
dependencies = [
"argh",
"colorous",
"palette",
]
[[package]]
name = "palette"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49"
dependencies = [
"approx",
"num-traits",
"palette_derive",
"phf",
]
[[package]]
name = "palette_derive"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427"
dependencies = [
"find-crate",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "phf"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
dependencies = [
"phf_macros",
"phf_shared",
]
[[package]]
name = "phf_generator"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
dependencies = [
"phf_shared",
"rand",
]
[[package]]
name = "phf_macros"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
dependencies = [
"phf_generator",
"phf_shared",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "phf_shared"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
dependencies = [
"siphasher",
]
[[package]]
name = "proc-macro2"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
[[package]]
name = "serde"
version = "1.0.143"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
[[package]]
name = "siphasher"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
[[package]]
name = "syn"
version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "toml"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
"serde",
]
[[package]]
name = "unicode-ident"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
[[package]]
name = "unicode-segmentation"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
pkgs/tools/misc/0x/add-Cargo-lock.diff
-236
View File
@@ -1,236 +0,0 @@
diff -Naur 0x-main.old/Cargo.lock 0x-main/Cargo.lock
--- 0x-main.old/Cargo.lock 1969-12-31 21:00:00.000000000 -0300
+++ 0x-main/Cargo.lock 2022-08-12 02:28:29.538688138 -0300
@@ -0,0 +1,232 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "argh"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62"
+dependencies = [
+ "argh_derive",
+ "argh_shared",
+]
+
+[[package]]
+name = "argh_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc"
+dependencies = [
+ "argh_shared",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "argh_shared"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda"
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "colorous"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882e392738ed515520f38708166e9efec85ee154f80bf1fc64510e2fc54bf481"
+
+[[package]]
+name = "find-crate"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
+dependencies = [
+ "toml",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "ohx"
+version = "0.1.0"
+dependencies = [
+ "argh",
+ "colorous",
+ "palette",
+]
+
+[[package]]
+name = "palette"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49"
+dependencies = [
+ "approx",
+ "num-traits",
+ "palette_derive",
+ "phf",
+]
+
+[[package]]
+name = "palette_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427"
+dependencies = [
+ "find-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+
+[[package]]
+name = "serde"
+version = "1.0.143"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "syn"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
pkgs/tools/misc/0x/default.nix
+6 -2
View File
@@ -14,9 +14,13 @@ rustPlatform.buildRustPackage {
hash = "sha256-NzD/j8rBfk/cpoBnkFHFqpXz58mswLZr8TUS16vlrZQ=";
};
cargoPatches = [ ./add-Cargo-lock.diff ];
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoHash = "sha256-3qaPGIbl1jF4784KGxbfBTgW/0ayxIO9Ufp9vkhIJa4=";
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
meta = with lib; {
homepage = "https://github.com/mcy/0x";
pkgs/tools/misc/ostree/default.nix
+2 -2
View File
@@ -43,13 +43,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
version = "2022.7";
version = "2023.1";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "sha256-i+KpJhyU6LnsQRM4D/xID4WYJF+zIaAJutT65LgiQR8=";
sha256 = "sha256-3XkrFnaToZccn24xaAE9kGrANRAP9scZo7Mi60S5b1U=";
};
patches = [
pkgs/tools/security/eid-mw/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "eid-mw";
# NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
version = "5.1.9";
version = "5.1.10";
src = fetchFromGitHub {
owner = "Fedict";
repo = "eid-mw";
rev = "v${version}";
hash = "sha256-E7mNEgh8hujagqQe0ycEGcRDOlxVY7KzXw+DD8Wf9N8=";
hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI=";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
pkgs/top-level/all-packages.nix
+7 -1
View File
@@ -9303,6 +9303,10 @@ with pkgs;
ox = callPackage ../applications/editors/ox { };
oxigraph = callPackage ../servers/oxigraph {
inherit (darwin.apple_sdk.frameworks) IOKit Security;
};
file-rename = callPackage ../tools/filesystems/file-rename { };
kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {};
@@ -24550,6 +24554,8 @@ with pkgs;
mimir = callPackage ../servers/monitoring/mimir { };
phlare = callPackage ../servers/monitoring/phlare { };
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };
grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { };
@@ -31432,7 +31438,7 @@ with pkgs;
xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { };
xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
pkgs/top-level/python-aliases.nix
+1
View File
@@ -145,6 +145,7 @@ mapAliases ({
mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29
mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12
mistune_2_0 = mistune; # added 2022-08-12
mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21
mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02
net2grid = gridnet; # add 2022-04-22
nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
pkgs/top-level/python-packages.nix
+2 -2
View File
@@ -6076,8 +6076,6 @@ self: super: with self; {
mox3 = callPackage ../development/python-modules/mox3 { };
mox = callPackage ../development/python-modules/mox { };
mpd2 = callPackage ../development/python-modules/mpd2 { };
mpi4py = callPackage ../development/python-modules/mpi4py { };
@@ -6552,6 +6550,8 @@ self: super: with self; {
nxt-python = callPackage ../development/python-modules/nxt-python { };
python-jwt = callPackage ../development/python-modules/python-jwt { };
python-nvd3 = callPackage ../development/python-modules/python-nvd3 { };
py-deprecate = callPackage ../development/python-modules/py-deprecate { };