Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
323ea758dd
@ -149,7 +149,7 @@ in {
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
example = literalExample "pkgs.deluge-1_x";
|
||||
example = literalExample "pkgs.deluge-2_x";
|
||||
description = ''
|
||||
Deluge package to use.
|
||||
'';
|
||||
@ -184,6 +184,13 @@ in {
|
||||
if versionAtLeast config.system.stateVersion "20.09" then
|
||||
pkgs.deluge-2_x
|
||||
else
|
||||
# deluge-1_x is no longer packaged and this will resolve to an error
|
||||
# thanks to the alias for this name. This is left here so that anyone
|
||||
# using NixOS older than 20.09 receives that error when they upgrade
|
||||
# and is forced to make an intentional choice to switch to deluge-2_x.
|
||||
# That might be slightly inconvenient but there is no path to
|
||||
# downgrade from 2.x to 1.x so NixOS should not automatically perform
|
||||
# this state migration.
|
||||
pkgs.deluge-1_x
|
||||
);
|
||||
|
||||
|
||||
@ -5,41 +5,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
};
|
||||
|
||||
nodes = {
|
||||
simple1 = {
|
||||
services.deluge = {
|
||||
enable = true;
|
||||
package = pkgs.deluge-1_x;
|
||||
web = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
declarative1 = {
|
||||
services.deluge = {
|
||||
enable = true;
|
||||
package = pkgs.deluge-1_x;
|
||||
openFirewall = true;
|
||||
declarative = true;
|
||||
config = {
|
||||
allow_remote = true;
|
||||
download_location = "/var/lib/deluge/my-download";
|
||||
daemon_port = 58846;
|
||||
listen_ports = [ 6881 6889 ];
|
||||
};
|
||||
web = {
|
||||
enable = true;
|
||||
port = 3142;
|
||||
};
|
||||
authFile = pkgs.writeText "deluge-auth" ''
|
||||
localclient:a7bef72a890:10
|
||||
andrew:password:10
|
||||
user3:anotherpass:5
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
simple2 = {
|
||||
services.deluge = {
|
||||
enable = true;
|
||||
|
||||
@ -53,8 +53,13 @@ let
|
||||
);
|
||||
|
||||
scriptDerivation = {src, ...}@attrs : pluginDerivation ({
|
||||
phases = [ "extraLib" "installPhase" ];
|
||||
installPhase = "installScripts ${src}";
|
||||
prePhases = "extraLib";
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
installScripts ${src}
|
||||
runHook postInstall
|
||||
'';
|
||||
} // attrs);
|
||||
in
|
||||
{
|
||||
|
||||
@ -18,9 +18,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "93.0.4577.42",
|
||||
"sha256": "180lywcimhlcwbxmn37814hd96bqnqrp3whbzv6ln3hwca2da4hl",
|
||||
"sha256bin64": "19px9h9vf9p2ipirv8ryaxvhfkls0nfiw7jz1d4h61r3r6ay5fc4",
|
||||
"version": "93.0.4577.51",
|
||||
"sha256": "0b3mx5ns4pbrwc7s2iz8ffv8lhay6p9gj0dnsd1qzxgqwgrv37h5",
|
||||
"sha256bin64": "1b8ypv14c5ky789dm17czv4yf7v21lwhnf2ygkdzryvd3i056nsz",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-07-08",
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "deluge";
|
||||
version = "1.3.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix preferences when built against libtorrent >=0.16
|
||||
(fetchpatch {
|
||||
url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e";
|
||||
sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity
|
||||
libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp -R deluge/data/pixmaps $out/share/
|
||||
cp -R deluge/data/icons $out/share/
|
||||
cp deluge/data/share/applications/deluge.desktop $out/share/applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://deluge-torrent.org";
|
||||
description = "Torrent client";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ domenkozar ebzzry ];
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -5,20 +5,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swayidle";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swayidle";
|
||||
rev = version;
|
||||
sha256 = "1nd3v8r9549lykdwh4krldfl59lzaspmmai5k1icy7dvi6kkr18r";
|
||||
sha256 = "0ziya8d5pvvxg16jhy4i04pvq11bdvj68gz5q654ar4dldil17nn";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "version: '1.5'" "version: '${version}'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||
buildInputs = [ wayland wayland-protocols systemd ];
|
||||
|
||||
|
||||
@ -14,14 +14,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "2021.08.06";
|
||||
version = "2021.08.16";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "dd6376433154e008045695f5420469670b0c3a88";
|
||||
sha256 = "197k0a3cjnwinr4nnx7gqvpfi0wdhnmsmvcx12166jg7m1va5kw7";
|
||||
rev = "b37d133c43c45862bd5c550b5d7fffaa8c49b968";
|
||||
sha256 = "0qc9d8cay2j5ggn0mgjq484vv7a14na16s9dmp7bqz7r9cn4b98n";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
|
||||
@ -34,13 +34,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "0.9+4272";
|
||||
version = "0.9+4276";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "83c0f82dc842fc859dfb4b19e766b23f965cfbb3";
|
||||
sha256 = "08lyx2fp34fvnv0lj77r5v3s9a0zr32ywpcz0v8i6wwscjfbp8ba";
|
||||
rev = "75a4cdfc8afc10fed80e43fb1ba31c7edaf6e361";
|
||||
sha256 = "13xb7ny6i0kr6z6xkj9wmmcj551si7w05r3cghq8h8wkikyh6c8p";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "yosys-bluespec";
|
||||
version = "2021.01.17";
|
||||
version = "2021.08.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thoughtpolice";
|
||||
repo = "yosys-bluespec";
|
||||
rev = "3cfa22c2810b840f406610efe3d7657477c1b0ed";
|
||||
sha256 = "1r48128yisw5lpziaj3hq88acghwi94pvm4735xajx8dl79jkcng";
|
||||
rev = "bcea1635c97747acd3bcb5b8f1968b3f57ae62bc";
|
||||
sha256 = "0ipx9yjngs3haksdb440wlydviszwqnxgzynpp7yic2x3ai7i8m1";
|
||||
};
|
||||
|
||||
buildInputs = [ yosys readline zlib bluespec ];
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chalice";
|
||||
version = "1.23.0";
|
||||
version = "1.24.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8e3b26f8ec15197d8c04cd1edb0d692a490cb5ec179560183a403de63f21c1d7";
|
||||
sha256 = "e4faf2247291407481f7daa8cdb63120d3ea9f454332f3a74eefa33a307ef0e5";
|
||||
};
|
||||
|
||||
checkInputs = [ watchdog pytest hypothesis mock ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "defcon";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1sj9yhwkyvzchglpy07pkx5362mwlap581ibv150b5l9s5mxn2j1";
|
||||
sha256 = "140f51da51e9630a9fa11dfd34376c4e29785fdb0bddc2e371df5b36bec17b76";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "53d02ba86d53613833ca54ddad097ae048b2aa4f6e7a435a4de979d89abb8be0";
|
||||
sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyodbc";
|
||||
version = "4.0.30";
|
||||
version = "4.0.31";
|
||||
disabled = isPyPy; # use pypypdbc instead
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5";
|
||||
sha256 = "89256e79d23415887cacf0a821f9f94baa5d833080521d456687d5e88c40c226";
|
||||
};
|
||||
|
||||
buildInputs = [ unixODBC ];
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-cache";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "reclosedev";
|
||||
repo = "requests-cache";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QGh/ThI5bKE65luVHDSsr6RQq5RReugdZrVvR1R0pUU=";
|
||||
sha256 = "sha256-FndKFdmEsp3TF2W4b7nhARi9ZOutlE43vvzYxiwbL08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "SoMaJo";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsproisl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07jkkg5ph5m47xf8w5asy5930qcpy6p11j0admll2y6yjynd2b47";
|
||||
sha256 = "0clcndij4nd5ig7padvb9dj5hfxg6nymn9sf42bjr9ipjihcsbdq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ regex ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "sqlitebrowser";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ray6cscx2qil1dfi7hmpijmq3kba49wn430ih1q4fkz9psjvrz1";
|
||||
sha256 = "sha256-33iVic0kxemWld+SiHOWGlKFSi5fpk1RtLUiNDr7WNI=";
|
||||
};
|
||||
|
||||
# We should be using qscintilla from nixpkgs instead of the vendored version,
|
||||
|
||||
@ -115,13 +115,13 @@ rec {
|
||||
headers = "0b66a7nbi1mybqy0j8x6hnp9k0jzvr6lpp4zsazhbfpk47px116y";
|
||||
};
|
||||
|
||||
electron_13 = mkElectron "13.1.9" {
|
||||
x86_64-linux = "60c7c74a5dd00ebba6d6b5081a4b83d94ac97ec5e53488b8b8a1b9aabe17fefc";
|
||||
x86_64-darwin = "b897bdc42d9d1d0a49fc513c769603bff6e111389e2a626eb628257bc705f634";
|
||||
i686-linux = "081f08ce7ff0e1e8fb226a322b855f951d120aa522773f17dd8e5a87969b001f";
|
||||
armv7l-linux = "c6b6b538d4764104372539c511921ddecbf522ded1fea856cbc3d9a303a86206";
|
||||
aarch64-linux = "9166dd3e703aa8c9f75dfee91fb250b9a08a32d8181991c1143a1da5aa1a9f20";
|
||||
aarch64-darwin = "a1600c0321a0906761fdf88ab9f30d1c53b53803ca33bcae20a6ef7a6761cac1";
|
||||
headers = "1k9x9hgwl23sd5zsdrdlcjp4ap40g282a1dxs1jyxrwq1dzgmsl3";
|
||||
electron_13 = mkElectron "13.2.0" {
|
||||
x86_64-linux = "def2e796fd0726f097d2c6997827f60de1940944dabcad33257bee9b4f8734da";
|
||||
x86_64-darwin = "8d9970c0153e0a79aae5aed053da8652d05fc67c8f29cd17416a860bf7f82c1d";
|
||||
i686-linux = "507d57e01b16549fe627bc55d8b94bf0f7676c7368438e749c6048869216d290";
|
||||
armv7l-linux = "9f46b2e18729ff50d290babbef3bf57711ed96eceffdd101b109572790f914f2";
|
||||
aarch64-linux = "386e0937ef78dce21e48589d6b76748c316ef6d4f8e8157a8b2ca08780ffbe2f";
|
||||
aarch64-darwin = "232fa40a9ce498a17aa0be1e72c81173c1f614fd5d48cc34c3f387a3c9921e08";
|
||||
headers = "00fwlqpiy2872d2yx4nhcg5a3n7z7cb0z0a82xbrlp6g0clh5v0w";
|
||||
};
|
||||
}
|
||||
|
||||
24
pkgs/development/tools/pypi-mirror/default.nix
Normal file
24
pkgs/development/tools/pypi-mirror/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, python3
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pypi-mirror";
|
||||
version = "4.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "montag451";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0slh8ahywcgbggfcmzyqpb8bmq9dkk6vvjfkbi0ashnm8c6x19vd";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pypi_mirror" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A script to create a partial PyPI mirror";
|
||||
homepage = "https://github.com/montag451/pypi-mirror";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
};
|
||||
}
|
||||
@ -1,20 +1,25 @@
|
||||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.13.9";
|
||||
suffix = "zen1";
|
||||
# having the full version string here makes it easier to update
|
||||
modDirVersion = "5.13.10-zen1";
|
||||
parts = lib.splitString "-" modDirVersion;
|
||||
version = lib.elemAt parts 0;
|
||||
suffix = lib.elemAt parts 1;
|
||||
|
||||
numbers = lib.splitString "." version;
|
||||
branch = "${lib.elemAt numbers 0}.${lib.elemAt numbers 1}";
|
||||
in
|
||||
|
||||
buildLinux (args // {
|
||||
modDirVersion = "${version}-${suffix}";
|
||||
inherit version;
|
||||
inherit version modDirVersion;
|
||||
isZen = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "sha256-RuY6ZIIKU56R+IGMtQDV6mIubGDqonRpsIdlrpAHFXM=";
|
||||
rev = "v${modDirVersion}";
|
||||
sha256 = "sha256-0QNRWKB7tAWZR3wuKJf+es6WqjScSKnDrMwH74o2oOA=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
@ -22,7 +27,7 @@ buildLinux (args // {
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
branch = "5.13";
|
||||
inherit branch;
|
||||
maintainers = with lib.maintainers; [ atemu andresilva ];
|
||||
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
|
||||
};
|
||||
|
||||
21
pkgs/os-specific/linux/kernel/update-zen.sh
Executable file
21
pkgs/os-specific/linux/kernel/update-zen.sh
Executable file
@ -0,0 +1,21 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../.. -i bash -p nix-prefetch git gnused gnugrep nix curl
|
||||
set -euo pipefail -x
|
||||
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
old=$(nix-instantiate --eval -A linuxPackages_zen.kernel.modDirVersion "$nixpkgs")
|
||||
old="${old%\"}"
|
||||
old="${old#\"}"
|
||||
new=$(curl https://github.com/zen-kernel/zen-kernel/releases.atom | grep -m1 -o -E '[0-9.]+-zen[0-9]+')
|
||||
if [[ "$new" == "$old" ]]; then
|
||||
echo "already up-to-date"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix"
|
||||
|
||||
sed -i -e "s!modDirVersion = \".*\"!modDirVersion = \"${new}\"!" "$path"
|
||||
checksum=$(nix-prefetch "(import ${nixpkgs} {}).linuxPackages_zen.kernel")
|
||||
sed -i -e "s!sha256 = \".*\"!sha256 = \"${checksum}\"!" "$path"
|
||||
|
||||
git commit -m "linux_zen: ${old} -> ${new}" $path
|
||||
22
pkgs/tools/filesystems/tar2ext4/default.nix
Normal file
22
pkgs/tools/filesystems/tar2ext4/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tar2ext4";
|
||||
version = "0.8.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "hcsshim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X7JsUFL9NkNT7ihE5olrqMUP8RnoVC10KLrQeT/OU3o=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cmd/tar2ext4";
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert a tar archive to an ext4 image";
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon
|
||||
pythonPath = [
|
||||
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
|
||||
dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
|
||||
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
|
||||
libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
|
||||
xz zip zstd
|
||||
]
|
||||
@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
|
||||
argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c
|
||||
python_magic progressbar33 pypdf2 rpm tlsh
|
||||
])
|
||||
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ]
|
||||
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
|
||||
++ lib.optionals enableBloat ([
|
||||
abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
|
||||
hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2
|
||||
@ -70,6 +70,19 @@ python3Packages.buildPythonApplication rec {
|
||||
# Failing because of file-v5.40 has a slightly different output.
|
||||
# Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271
|
||||
"test_text_proper_indentation"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Disable flaky tests on Darwin
|
||||
"test_non_unicode_filename"
|
||||
"test_listing"
|
||||
];
|
||||
|
||||
# flaky tests on Darwin
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
"tests/comparators/test_git.py"
|
||||
"tests/comparators/test_java.py"
|
||||
"tests/comparators/test_uimage.py"
|
||||
"tests/comparators/test_device.py"
|
||||
"tests/comparators/test_macho.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pgcenter";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lesovsky";
|
||||
repo = "pgcenter";
|
||||
rev = "v${version}";
|
||||
sha256 = "18s102hv6qqlx0nra91srdlb5fyv6x3hwism6c2r6zbxh68pgsag";
|
||||
sha256 = "sha256-xaY01T12/5Peww9scRgfc5yHj7QA8BEwOK5l6OedziY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0mgq9zl56wlr37dxxa1sh53wfkhrl9ybjvxj5y9djspqkp4j45pn";
|
||||
vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU=";
|
||||
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thermald";
|
||||
version = "2.4.3";
|
||||
version = "2.4.6";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "intel";
|
||||
repo = "thermal_daemon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CPrk2r3C4WG+y3KzWf6xWhfNdDgEigki62iAXu+DccU=";
|
||||
sha256 = "sha256-ZknZznoYVX3dNBIUvER6odv5eNrCV3//CXH1ypCf6tE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -183,6 +183,14 @@ mapAliases ({
|
||||
deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
|
||||
deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
|
||||
deltachat-electron = deltachat-desktop; # added 2021-07-18
|
||||
deluge-1_x = throw ''
|
||||
Deluge 1.x (deluge-1_x) is no longer supported.
|
||||
Please use Deluge 2.x (deluge-2_x) instead, for example:
|
||||
|
||||
services.deluge.package = pkgs.deluge-2_x;
|
||||
|
||||
Note that it is NOT possible to switch back to Deluge 1.x after this change.
|
||||
''; # added 2021-08-18
|
||||
desktop_file_utils = desktop-file-utils; # added 2018-02-25
|
||||
devicemapper = lvm2; # added 2018-04-25
|
||||
digikam5 = digikam; # added 2017-02-18
|
||||
|
||||
@ -4197,10 +4197,6 @@ with pkgs;
|
||||
pythonPackages = python3Packages;
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; };
|
||||
};
|
||||
deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix {
|
||||
pythonPackages = python2Packages;
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-1_1_x;
|
||||
};
|
||||
deluge = deluge-2_x;
|
||||
|
||||
desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { };
|
||||
@ -4256,7 +4252,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
diffoscope = diffoscopeMinimal.override {
|
||||
enableBloat = true;
|
||||
enableBloat = !stdenv.isDarwin;
|
||||
};
|
||||
|
||||
diffr = callPackage ../tools/text/diffr {
|
||||
@ -9300,6 +9296,8 @@ with pkgs;
|
||||
|
||||
znapzend = callPackage ../tools/backup/znapzend { };
|
||||
|
||||
tar2ext4 = callPackage ../tools/filesystems/tar2ext4 { };
|
||||
|
||||
targetcli = callPackage ../os-specific/linux/targetcli { };
|
||||
|
||||
target-isns = callPackage ../os-specific/linux/target-isns { };
|
||||
@ -12856,6 +12854,8 @@ with pkgs;
|
||||
|
||||
pypi2nix = callPackage ../development/tools/pypi2nix {};
|
||||
|
||||
pypi-mirror = callPackage ../development/tools/pypi-mirror {};
|
||||
|
||||
setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {};
|
||||
|
||||
# These pyside tools do not provide any Python modules and are meant to be here.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user