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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2022-07-13 09:57:41 +02:00
parent 9bea0f82dd 7c6a8f0b38
commit 8169a7fce0
81 changed files with 1386 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/CODEOWNERS
+2 -2
View File
@@ -256,8 +256,8 @@
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq
# GNOME
/pkgs/desktops/gnome @jtojnar @hedning
/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning
/pkgs/desktops/gnome @jtojnar
/pkgs/desktops/gnome/extensions @piegamesde @jtojnar
# Cinnamon
/pkgs/desktops/cinnamon @mkg20001
nixos/modules/services/networking/ddclient.nix
+3 -4
View File
@@ -13,7 +13,7 @@ let
foreground=YES
use=${cfg.use}
login=${cfg.username}
password=${lib.optionalString (cfg.protocol == "nsupdate") "/run/${RuntimeDirectory}/ddclient.key"}
password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"}
protocol=${cfg.protocol}
${lib.optionalString (cfg.script != "") "script=${cfg.script}"}
${lib.optionalString (cfg.server != "") "server=${cfg.server}"}
@@ -33,10 +33,9 @@ let
${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then ''
install ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
'' else if (cfg.passwordFile != null) then ''
password=$(printf "%q" "$(head -n 1 "${cfg.passwordFile}")")
sed -i "s|^password=$|password=$password|" /run/${RuntimeDirectory}/ddclient.conf
"${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf"
'' else ''
sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf
sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf
'')}
'';
pkgs/applications/emulators/craftos-pc/default.nix
+34 -8
View File
@@ -1,26 +1,45 @@
{ lib, stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }:
{ lib
, stdenv
, fetchFromGitHub
, patchelf
, unzip
, poco
, openssl
, SDL2
, SDL2_mixer
, ncurses
, libpng
, pngpp
, libwebp
}:
let
craftos2-lua = fetchFromGitHub {
owner = "MCJack123";
repo = "craftos2-lua";
rev = "v2.4.4";
sha256 = "1q63ki4sxx8bxaa6ag3xj153p7a8a12ivm0k33k935p41k6y2k64";
rev = "v2.6.6";
sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w=";
};
craftos2-rom = fetchFromGitHub {
owner = "McJack123";
repo = "craftos2-rom";
rev = "v2.6.6";
sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw=";
};
in
stdenv.mkDerivation rec {
pname = "craftos-pc";
version = "2.4.5";
version = "2.6.6";
src = fetchFromGitHub {
owner = "MCJack123";
repo = "craftos2";
rev = "v${version}";
sha256 = "00a4p365krbdprlv4979d13mm3alhxgzzj3vqz2g67795plf64j4";
sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E=";
};
buildInputs = [ poco openssl SDL2 SDL2_mixer ];
buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];
preBuild = ''
cp -R ${craftos2-lua}/* ./craftos2-lua/
@@ -28,16 +47,23 @@ stdenv.mkDerivation rec {
make -C craftos2-lua linux
'';
dontStrip = true;
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/bin $out/lib $out/share/craftos $out/include
DESTDIR=$out/bin make install
cp ./craftos2-lua/src/liblua.so $out/lib
patchelf --replace-needed craftos2-lua/src/liblua.so liblua.so $out/bin/craftos
cp -R api $out/include/CraftOS-PC
cp -R ${craftos2-rom}/* $out/share/craftos
'';
meta = with lib; {
description = "An implementation of the CraftOS-PC API written in C++ using SDL";
homepage = "https://www.craftos-pc.cc";
license = licenses.mit;
license = with licenses; [ mit free ];
platforms = platforms.linux;
maintainers = [ maintainers.siraben ];
mainProgram = "craftos";
};
}
pkgs/applications/networking/browsers/brave/default.nix
+2 -2
View File
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.39.122";
version = "1.40.113";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-UJtVFvcVzfpdDbCkXs9UetS/1IUIn1mxUy7TcaXL5Jo=";
sha256 = "sha256-+lJjLfxEOf82uvcVaRbWYQ93KEzWGVrzXvI9Rt1U9Bc=";
};
dontConfigure = true;
pkgs/applications/networking/cluster/hadoop/default.nix
+19 -13
View File
@@ -26,12 +26,13 @@ with lib;
assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
let
common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:
common = { pname, versions, untarDir ? "${pname}-${version}", hash, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:
stdenv.mkDerivation rec {
inherit pname version jdk libPatches untarDir openssl;
inherit pname jdk libPatches untarDir openssl;
version = versions.${stdenv.system};
src = fetchurl {
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz";
sha256 = sha256.${stdenv.system};
hash = hash.${stdenv.system};
};
doCheck = true;
@@ -79,7 +80,7 @@ let
computers, each of which may be prone to failures.
'';
maintainers = with maintainers; [ illustris ];
platforms = attrNames sha256;
platforms = attrNames hash;
};
};
in
@@ -88,12 +89,17 @@ in
# https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions
hadoop_3_3 = common rec {
pname = "hadoop";
version = "3.3.1";
untarDir = "${pname}-${version}";
sha256 = rec {
x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";
versions = rec {
x86_64-linux = "3.3.3";
x86_64-darwin = x86_64-linux;
aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz";
aarch64-linux = "3.3.1";
aarch64-darwin = aarch64-linux;
};
untarDir = "${pname}-${version}";
hash = rec {
x86_64-linux = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q=";
x86_64-darwin = x86_64-linux;
aarch64-linux = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI=";
aarch64-darwin = aarch64-linux;
};
jdk = jdk11_headless;
@@ -116,8 +122,8 @@ in
};
hadoop_3_2 = common rec {
pname = "hadoop";
version = "3.2.2";
sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp";
versions.x86_64-linux = "3.2.3";
hash.x86_64-linux = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU=";
jdk = jdk8_headless;
# not using native libs because of broken openssl_1_0_2 dependency
# can be manually overriden
@@ -125,8 +131,8 @@ in
};
hadoop2 = common rec {
pname = "hadoop";
version = "2.10.1";
sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97";
versions.x86_64-linux = "2.10.2";
hash.x86_64-linux = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo=";
jdk = jdk8_headless;
tests = nixosTests.hadoop2;
};
pkgs/applications/networking/instant-messengers/zulip-term/default.nix
+14 -10
View File
@@ -7,30 +7,28 @@
python3.pkgs.buildPythonApplication rec {
pname = "zulip-term";
version = "0.6.0";
version = "0.7.0";
# no tests on PyPI
src = fetchFromGitHub {
owner = "zulip";
repo = "zulip-terminal";
rev = version;
sha256 = "sha256-nlvZaGMVRRCu8PZHxPWjNSxkqhZs0T/tE1js/3pDUFk=";
sha256 = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
};
patches = [
./pytest-executable-name.patch
];
propagatedBuildInputs = with python3.pkgs; [
urwid
zulip
urwid-readline
beautifulsoup4
lxml
typing-extensions
pygments
pyperclip
python-dateutil
pytz
typing-extensions
tzlocal
urwid
urwid-readline
zulip
];
checkInputs = [
@@ -45,6 +43,12 @@ python3.pkgs.buildPythonApplication rec {
"--prefix" "PATH" ":" (lib.makeBinPath [ libnotify ])
];
disabledTests = [
# IndexError: list index out of range
"test_main_multiple_notify_options"
"test_main_multiple_autohide_options"
];
meta = with lib; {
description = "Zulip's official terminal client";
homepage = "https://github.com/zulip/zulip-terminal";
pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py
index 459aa82..c6e434e 100644
--- a/tests/cli/test_run.py
+++ b/tests/cli/test_run.py
@@ -180,7 +180,7 @@ def test_main_multiple_autohide_options(capsys, options):
assert str(e.value) == "2"
captured = capsys.readouterr()
lines = captured.err.strip('\n')
- lines = lines.split("pytest: ", 1)[1]
+ lines = lines.split("__main__.py: ", 1)[1]
expected = ("error: argument {}: not allowed "
"with argument {}".format(options[1], options[0]))
assert lines == expected
pkgs/applications/networking/sync/rsync/rrsync.nix
+5 -3
View File
@@ -1,11 +1,13 @@
{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }:
{ stdenv, python3, rsync }:
stdenv.mkDerivation {
pname = "rrsync";
inherit (rsync) version srcs;
buildInputs = [ rsync perl ];
buildInputs = [
rsync
(python3.withPackages (pythonPackages: with pythonPackages; [ braceexpand ]))
];
# Skip configure and build phases.
# We just want something from the support directory
dontConfigure = true;
pkgs/applications/science/machine-learning/nengo-gui/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "nengo-gui";
version = "0.4.8";
version = "0.4.9";
src = fetchFromGitHub {
owner = "nengo";
repo = "nengo-gui";
rev = "v${version}";
sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3";
rev = "refs/tags/v${version}";
sha256 = "sha256-aBi4roe9pqPmpbW5zrbDoIvyH5mTKgIzL2O5j1+VBMY=";
};
propagatedBuildInputs = with python3Packages; [ nengo ];
pkgs/applications/science/math/lp_solve/default.nix
+22 -13
View File
@@ -1,7 +1,12 @@
{ lib, stdenv, fetchurl, cctools, fixDarwinDylibNames }:
{ lib
, stdenv
, fetchurl
, cctools
, fixDarwinDylibNames
, autoSignDarwinBinariesHook
}:
stdenv.mkDerivation rec {
pname = "lp_solve";
version = "5.5.2.11";
@@ -13,20 +18,24 @@ stdenv.mkDerivation rec {
nativeBuildInputs = lib.optionals stdenv.isDarwin [
cctools
fixDarwinDylibNames
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook
];
dontConfigure = true;
buildPhase = let
ccc = if stdenv.isDarwin then "ccc.osx" else "ccc";
in ''
runHook preBuild
buildPhase =
let
ccc = if stdenv.isDarwin then "ccc.osx" else "ccc";
in
''
runHook preBuild
(cd lpsolve55 && bash -x -e ${ccc})
(cd lp_solve && bash -x -e ${ccc})
(cd lpsolve55 && bash -x -e ${ccc})
(cd lp_solve && bash -x -e ${ccc})
runHook postBuild
'';
runHook postBuild
'';
installPhase = ''
runHook preInstall
@@ -44,9 +53,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A Mixed Integer Linear Programming (MILP) solver";
homepage = "http://lpsolve.sourceforge.net";
license = licenses.gpl2Plus;
homepage = "http://lpsolve.sourceforge.net";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ smironov ];
platforms = platforms.unix;
platforms = platforms.unix;
};
}
pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
index ca353c4099..499be0a986 100644
--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
// the alternative stack. Ensure that the size of the alternative stack is
// large enough.
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
// Only set an alternative stack if there isn't already one, or if the current
// one is too small.
pkgs/applications/science/misc/graphia/default.nix
+18 -4
View File
@@ -1,22 +1,36 @@
{ stdenv, lib, cmake, fetchFromGitHub
, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects
{ stdenv
, lib
, cmake
, fetchFromGitHub
, wrapQtAppsHook
, qtbase
, qtquickcontrols2
, qtgraphicaleffects
}:
stdenv.mkDerivation rec {
pname = "graphia";
version = "2.2";
version = "3.0";
src = fetchFromGitHub {
owner = "graphia-app";
repo = "graphia";
rev = version;
sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w";
sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY=";
};
patches = [
# Fix for a breakpad incompatibility with glibc>2.33
# https://github.com/pytorch/pytorch/issues/70297
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
./breakpad-sigstksz.patch
];
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
qtbase
qtquickcontrols2
pkgs/applications/system/glances/default.nix
+12 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
, defusedxml, future, packaging, psutil, setuptools
# Optional dependencies:
, bottle, pysnmp
@@ -20,7 +20,17 @@ buildPythonApplication rec {
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch;
patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch
++ lib.optional (doCheck && stdenv.isDarwin)
[
# Fix "TypeError: unsupported operand type(s) for +=: 'int' and 'NoneType'" on darwin
# https://github.com/nicolargo/glances/pull/2082
(fetchpatch {
name = "fix-typeerror-when-testing-on-darwin.patch";
url = "https://patch-diff.githubusercontent.com/raw/nicolargo/glances/pull/2082.patch";
sha256 = "sha256-MIePPywZ2dTTqXjf7EJiHlQ7eltiHzgocqrnLeLJwZ4=";
})
];
# On Darwin this package segfaults due to mismatch of pure and impure
# CoreFoundation. This issues was solved for binaries but for interpreted
pkgs/applications/version-management/git-and-tools/gh/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
version = "2.13.0";
version = "2.14.1";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-9FWmEujTUWexyqNQVagU/U9AyOZJdWL5y4Q0ZHRBxcc=";
sha256 = "sha256-Mp8frinjAdsNYIFLFsk8yCeQLgo6cW33B4JadNHbifE=";
};
vendorSha256 = "sha256-a/+Dj66zT/W8rxvvXnJSdoyYhajMY1T3kEbrpC24tMU=";
vendorSha256 = "sha256-yhUP6BaR2xloy3/g7pKhn5ljwTEm8XwPaOiZCIfIM7E=";
nativeBuildInputs = [ installShellFiles ];
pkgs/applications/version-management/git-and-tools/tig/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tig";
version = "2.5.5";
version = "2.5.6";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1yx63jfbaa5h0d3lfqlczs9l7j2rnhp5jpa8qcjn4z1n415ay2x5";
sha256 = "sha256-WJtva3LbzVqtcAt0kmnti3RZTPg/CBjk6JQYa2VzpSQ=";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];
pkgs/applications/video/media-downloader/default.nix
+39
View File
@@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, qt5
, ffmpeg-full
, aria2
, yt-dlp
, python3
}:
stdenv.mkDerivation rec {
pname = "media-downloader";
version = "2.4.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = pname;
rev = "${version}";
sha256 = "sha256-EyfhomwBtdAt6HGRwnpiijm2D1LfaCAoG5qk3orDG98=";
};
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];
preFixup = ''
qtWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ ffmpeg-full aria2 yt-dlp python3 ]}"
)
'';
meta = with lib; {
description = "A Qt/C++ GUI front end to youtube-dl";
homepage = "https://github.com/mhogomchungu/media-downloader";
license = licenses.gpl2Plus;
broken = stdenv.isDarwin;
platforms = platforms.unix;
maintainers = with maintainers; [ zendo ];
};
}
pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+1 -1
View File
@@ -25,7 +25,7 @@ while read pkg_spec; do
pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")"
if [[ $pkg_src != https://api.nuget.org/* ]]; then
pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}"
pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}"
pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg"
echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}
else
pkgs/data/icons/papirus-icon-theme/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? "blue" }:
{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }:
stdenvNoCC.mkDerivation rec {
pname = "papirus-icon-theme";
@@ -28,8 +28,8 @@ stdenvNoCC.mkDerivation rec {
mv {,e}Papirus* $out/share/icons
for theme in $out/share/icons/*; do
${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color}
gtk-update-icon-cache $theme
${lib.optionalString (color != null) "${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color}"}
gtk-update-icon-cache --force $theme
done
runHook postInstall
pkgs/data/icons/zafiro-icons/default.nix
+28 -8
View File
@@ -1,14 +1,25 @@
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme, jdupes }:
{ lib
, stdenvNoCC
, fetchFromGitHub
, gtk3
, breeze-icons
, gnome-icon-theme
, numix-icon-theme
, numix-icon-theme-circle
, hicolor-icon-theme
, jdupes
, gitUpdater
}:
stdenvNoCC.mkDerivation rec {
pname = "zafiro-icons";
version = "1.2";
version = "1.3";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
rev = version;
sha256 = "sha256-Awc5Sw4X25pXEd4Ob0u6A6Uu0e8FYfwp0fEl90vrsUE=";
sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
};
nativeBuildInputs = [
@@ -33,19 +44,28 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
# remove copy file, as it is there clearly by mistake
rm "apps/scalable/android-sdk (copia 1).svg"
mkdir -p $out/share/icons
mkdir -p $out/share/icons/Zafiro-icons
cp -a * $out/share/icons/Zafiro-icons
for theme in Dark Light; do
cp -a $theme $out/share/icons/Zafiro-icons-$theme
gtk-update-icon-cache $out/share/icons/Zafiro-icons
# remove unneeded files
rm $out/share/icons/Zafiro-icons-$theme/_config.yml
# remove files with non-ascii characters in name
# https://github.com/zayronxio/Zafiro-icons/issues/111
rm $out/share/icons/Zafiro-icons-$theme/apps/scalable/βTORRENT.svg
gtk-update-icon-cache $out/share/icons/Zafiro-icons-$theme
done
jdupes --link-soft --recurse $out/share
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
meta = with lib; {
description = "Icon pack flat with light colors";
homepage = "https://github.com/zayronxio/Zafiro-icons";
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "e304e8df4de976f80d5d58e47cf560be91055799",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e304e8df4de976f80d5d58e47cf560be91055799.tar.gz",
"sha256": "10xws4lazlx8bx26xc8h6c7ab7gkzc01an7nwip3bghc1h92zr4m",
"msg": "Update from Hackage at 2022-07-02T15:59:48Z"
"commit": "c096b9d83b86ab92dffac5d97927e8458ebd4dfa",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c096b9d83b86ab92dffac5d97927e8458ebd4dfa.tar.gz",
"sha256": "1j9j97zn8qhxsigi73319l0dairkymjk6mknsgindzgsvrrag9xg",
"msg": "Update from Hackage at 2022-07-07T10:54:07Z"
}
pkgs/data/themes/flat-remix-gtk/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "flat-remix-gtk";
version = "20220527";
version = "20220627";
src = fetchFromGitHub {
owner = "daniruiz";
repo = pname;
rev = version;
sha256 = "sha256-mT7dRhLnJg5vZCmT0HbP6GXSjKFQ55BqisvCMwV3Zxc=";
sha256 = "sha256-z/ILu8UPbyEN/ejsxZ3CII3y3dI04ZNa1i6nyjKFis8=";
};
dontBuild = true;
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "6.0.5";
version = "6.0.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-Y/oDD/AsA9ZiKsfEV3/jnT3tmQYAIIToAZjMRVriK98=";
sha256 = "sha256-wAoLU59hEYubWn9o7cVlZ/mJoxJJjEkJA9xu9gwxQ7o=";
};
nativeBuildInputs = [
pkgs/desktops/plasma-5/fetch.sh
+1 -1
View File
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.2/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.3/ -A '*.tar.xz' )
pkgs/desktops/plasma-5/srcs.nix
+212 -212
View File
@@ -4,427 +4,427 @@
{
bluedevil = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/bluedevil-5.25.2.tar.xz";
sha256 = "0sx8qbmig787jmfixmv6ajawv6j846gcbj67szkfw4r4yqpsagr1";
name = "bluedevil-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/bluedevil-5.25.3.tar.xz";
sha256 = "059nm5rd5l8ql78slrjcgkjhka7g1rnh0f1nbgf57qccs7wp6qb5";
name = "bluedevil-5.25.3.tar.xz";
};
};
breeze = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/breeze-5.25.2.tar.xz";
sha256 = "198vzmhljbwrzn48x7g8caj2qwj3q82n6xlj50lpvxcmc0cv740w";
name = "breeze-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/breeze-5.25.3.tar.xz";
sha256 = "0za75ckgfcdxrh2qxgyl2c1273g2xqwmd55njsis1yvwryadypqw";
name = "breeze-5.25.3.tar.xz";
};
};
breeze-grub = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/breeze-grub-5.25.2.tar.xz";
sha256 = "1fnqfmjzlhw1lizax0225qypdm7k4zpxc90s57f2n2173qgi3qfc";
name = "breeze-grub-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/breeze-grub-5.25.3.tar.xz";
sha256 = "12l6skbbr4wv86k5f8969lg9m30x2nrgm38w0mr7fnsqavpbm7v6";
name = "breeze-grub-5.25.3.tar.xz";
};
};
breeze-gtk = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/breeze-gtk-5.25.2.tar.xz";
sha256 = "0vzl0nf39ky3f4jdsmm7hz9kj6yacjjx5mawgzv417zaa6khg8id";
name = "breeze-gtk-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/breeze-gtk-5.25.3.tar.xz";
sha256 = "1nmnxrhidv420bqm97cgmck44kzi6sdqaqg3bim07hbnzbq76d6r";
name = "breeze-gtk-5.25.3.tar.xz";
};
};
breeze-plymouth = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/breeze-plymouth-5.25.2.tar.xz";
sha256 = "026np3kkh6sd0rji7bl2x84za0bpgsljl2dmb3lhwydn93vpv9n1";
name = "breeze-plymouth-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/breeze-plymouth-5.25.3.tar.xz";
sha256 = "1lvsr48mrfjjvs132x2bn4dpwals8k8xinddn9nxykvqw5fiw3wd";
name = "breeze-plymouth-5.25.3.tar.xz";
};
};
discover = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/discover-5.25.2.tar.xz";
sha256 = "1cgalkajbpnpn6vzr84sqkvfdvsanx5l9pxhdkrd94s27gbr9l8c";
name = "discover-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/discover-5.25.3.tar.xz";
sha256 = "0bdg5gxl4zymmy44pvxs9nlk71psdra3778z20ss1j1k3x8dhlrs";
name = "discover-5.25.3.tar.xz";
};
};
drkonqi = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/drkonqi-5.25.2.tar.xz";
sha256 = "1a9y88vkq6qiaiabwy1a13cycj4n79ikn4zdk10zrkgqlnvbyq3y";
name = "drkonqi-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/drkonqi-5.25.3.tar.xz";
sha256 = "11g6pqxb4gjcg9jsm3z9yiqljkks30i2mvanvas5ds1y4py3q7a1";
name = "drkonqi-5.25.3.tar.xz";
};
};
kactivitymanagerd = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kactivitymanagerd-5.25.2.tar.xz";
sha256 = "06arr36kapjq0gbvk7wnwdgzn8bj64h2cpcrhvzjwmgh4azsz2ww";
name = "kactivitymanagerd-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kactivitymanagerd-5.25.3.tar.xz";
sha256 = "1095rmvgc9fzflpd9l1kzwdgk5zh7wxyyx7vzzb1kpdhvg4nwx57";
name = "kactivitymanagerd-5.25.3.tar.xz";
};
};
kde-cli-tools = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kde-cli-tools-5.25.2.tar.xz";
sha256 = "1s6v8xnx1d51lax02fkrx191jxiw6mbsixiw4hvh91viwdckmwr3";
name = "kde-cli-tools-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kde-cli-tools-5.25.3.tar.xz";
sha256 = "0m8v51ngxfwjianvw1ydr2dpblgik8kv7zw8mi95361kck9jh31h";
name = "kde-cli-tools-5.25.3.tar.xz";
};
};
kde-gtk-config = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kde-gtk-config-5.25.2.tar.xz";
sha256 = "1v5j2jy90mi309v43fgn3fadk0gapzvn48zizns6avc9v6h9kgvq";
name = "kde-gtk-config-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kde-gtk-config-5.25.3.tar.xz";
sha256 = "0xjb0vff7mw1kfj5b472plclk80hdqxi2858m3nmkh41bl6a523r";
name = "kde-gtk-config-5.25.3.tar.xz";
};
};
kdecoration = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kdecoration-5.25.2.tar.xz";
sha256 = "1ynghykyv0h4g3micdc3qf8xxy3vxrdd01gy31jskisksgjkyvw7";
name = "kdecoration-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kdecoration-5.25.3.tar.xz";
sha256 = "0b6ynqkndmlac89hv339k365m7wykp9y238df62jlq4vpr1r9x9y";
name = "kdecoration-5.25.3.tar.xz";
};
};
kdeplasma-addons = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kdeplasma-addons-5.25.2.tar.xz";
sha256 = "04n00s6z2cvwax1i8vs1f3by72qzpicsyw3c366kxnaiz3lklqzk";
name = "kdeplasma-addons-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kdeplasma-addons-5.25.3.tar.xz";
sha256 = "0z976qy49dbvn8nskkrwc1zfnjd3gdzbxzwkg0ini6vypfysybqm";
name = "kdeplasma-addons-5.25.3.tar.xz";
};
};
kgamma5 = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kgamma5-5.25.2.tar.xz";
sha256 = "0z784j2lyrwl0rlxivgcb91rcpziqnvvfhxzdjk8mkc7j9cxznkx";
name = "kgamma5-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kgamma5-5.25.3.tar.xz";
sha256 = "10750h6pb98c39s6ijk353jahwjhnj2nqmsmspx9jdz8ig20ygm0";
name = "kgamma5-5.25.3.tar.xz";
};
};
khotkeys = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/khotkeys-5.25.2.tar.xz";
sha256 = "1yr0zydpsl26gmn4n72lql9n4fxrfbzi405srd2694yaxl5xyzl1";
name = "khotkeys-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/khotkeys-5.25.3.tar.xz";
sha256 = "1v4c7lljdvl56mkk8hgbrrx13jdsq7mg8ggrf3qnv1x48yi31rdj";
name = "khotkeys-5.25.3.tar.xz";
};
};
kinfocenter = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kinfocenter-5.25.2.tar.xz";
sha256 = "004sgb89h0024bliha0bzfzx82d0qi62zicnq68jqngbj5hkmaqm";
name = "kinfocenter-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kinfocenter-5.25.3.tar.xz";
sha256 = "17hkyraqk4cwrv3rnlbw5jby7v8yv4mfxign1f3n5ldq76v9van1";
name = "kinfocenter-5.25.3.tar.xz";
};
};
kmenuedit = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kmenuedit-5.25.2.tar.xz";
sha256 = "0d9ldili1zjv4ri1b779zl0kyfxl818n3r7j8cqd3jyfrmh45jgi";
name = "kmenuedit-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kmenuedit-5.25.3.tar.xz";
sha256 = "0y374al92r0v5adi7jxj6lghbhjg07ym78xsx09qn48h5c0s34pp";
name = "kmenuedit-5.25.3.tar.xz";
};
};
kscreen = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kscreen-5.25.2.tar.xz";
sha256 = "0llassqfn24vkc88pagd0haqdlblg5ha09rw5q4cc6irvqwrvaxa";
name = "kscreen-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kscreen-5.25.3.tar.xz";
sha256 = "0p9pzigll9b5jj232sz05znf5syycif0dzvccxds6z0yr124jlvz";
name = "kscreen-5.25.3.tar.xz";
};
};
kscreenlocker = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kscreenlocker-5.25.2.tar.xz";
sha256 = "15zkmxwcv9cdaczxvjpipngv77dqhn0s26678831axfjzh7v89iy";
name = "kscreenlocker-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kscreenlocker-5.25.3.tar.xz";
sha256 = "1kii3r3j89avwyb00wrw80k5sj0q4wqgmy1q0yxfps9jk729k3wc";
name = "kscreenlocker-5.25.3.tar.xz";
};
};
ksshaskpass = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/ksshaskpass-5.25.2.tar.xz";
sha256 = "1zwhrzclbg3mxdwif13f9avv01kykwi8b3j9qk4ycfrwdvwidnd6";
name = "ksshaskpass-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/ksshaskpass-5.25.3.tar.xz";
sha256 = "0sfl77szvfq9c7v0gsv5nnf7h5kxigyy2z2p1cwmhm1pq4n606nk";
name = "ksshaskpass-5.25.3.tar.xz";
};
};
ksystemstats = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/ksystemstats-5.25.2.tar.xz";
sha256 = "1i6sg5j97w4nl508yl80v2rnr9zmb5f6ymvjvvkfbigp62yz8gcf";
name = "ksystemstats-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/ksystemstats-5.25.3.tar.xz";
sha256 = "0s08mazc081wxbccmb4s35i7p57an8nlxmw25lh1j83jj06gyd4f";
name = "ksystemstats-5.25.3.tar.xz";
};
};
kwallet-pam = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kwallet-pam-5.25.2.tar.xz";
sha256 = "0pffi0jkfib01aqqif5401avkljxsi468wg5nva1fg3h8w9i7xqd";
name = "kwallet-pam-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kwallet-pam-5.25.3.tar.xz";
sha256 = "1i345vl0sfzg8zmz6h8hsxmx9cbdb7072avc6yz42ra9yf4372jb";
name = "kwallet-pam-5.25.3.tar.xz";
};
};
kwayland-integration = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kwayland-integration-5.25.2.tar.xz";
sha256 = "1praxpzsbwb7b1p6rsnrmv9wdn5p0j28vch6ydj2qc25f8h7nvfj";
name = "kwayland-integration-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kwayland-integration-5.25.3.tar.xz";
sha256 = "0d45wigxspvv561fjam8yiyq6277n5wgv2sn8ymvqbal8v801bjf";
name = "kwayland-integration-5.25.3.tar.xz";
};
};
kwin = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kwin-5.25.2.tar.xz";
sha256 = "1mskwppqv3ismlg4r8fmlrya455mds8ng36lma4acj13vsh1wx2l";
name = "kwin-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kwin-5.25.3.tar.xz";
sha256 = "1vyh5ymvkzxsgs4904ijac6xrb5fgxpypc8mlnwcca1gd9xpr4jj";
name = "kwin-5.25.3.tar.xz";
};
};
kwrited = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/kwrited-5.25.2.tar.xz";
sha256 = "02c24ywwrzyz5k54ywh32lx2yrjd0xydn1f20h9h6cx16fmlwdq3";
name = "kwrited-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/kwrited-5.25.3.tar.xz";
sha256 = "133ampgha0348m5ild1dg48jpblk4c16d6nk759yywz8125wyapc";
name = "kwrited-5.25.3.tar.xz";
};
};
layer-shell-qt = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/layer-shell-qt-5.25.2.tar.xz";
sha256 = "14xk9hjxm267dfb8dxgwdjmws95nqc9ygr51mdzsyxqwis9v1i4m";
name = "layer-shell-qt-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/layer-shell-qt-5.25.3.tar.xz";
sha256 = "06rxqm4wh4mcszrwb2dbgpxj3dqfx0rccyyjp091lbsncqm1gib0";
name = "layer-shell-qt-5.25.3.tar.xz";
};
};
libkscreen = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/libkscreen-5.25.2.tar.xz";
sha256 = "0jy2p87jj39c75jmj95jqpilphwhzqf7m1qljhbrjgr2w1adnz9p";
name = "libkscreen-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/libkscreen-5.25.3.tar.xz";
sha256 = "1mxkrk04wcyw4xbfiyxbp5iwnhqr10yk39zx5bbjd9zag0vdi7z5";
name = "libkscreen-5.25.3.tar.xz";
};
};
libksysguard = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/libksysguard-5.25.2.tar.xz";
sha256 = "020wxlkj03sj0d81r1f8axw4i78gg45cm3zf6ikhyvka9hbh5xcy";
name = "libksysguard-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/libksysguard-5.25.3.tar.xz";
sha256 = "1mrrrxjvqmrnkjwafvqrd2hlvl9gr9y4hn7dv0gf70lp5bl06i89";
name = "libksysguard-5.25.3.tar.xz";
};
};
milou = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/milou-5.25.2.tar.xz";
sha256 = "15gf3mgbx8z4cahw6w978r5inpn9rfhzj7x5sfhi6w631nasd1yl";
name = "milou-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/milou-5.25.3.tar.xz";
sha256 = "1xb3i5dn6r4mglci8llchjz484zsw3kqyl9ag8wch54b5cjmz4ap";
name = "milou-5.25.3.tar.xz";
};
};
oxygen = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/oxygen-5.25.2.tar.xz";
sha256 = "0d7705s5lp4lac7rn7q7sy2l0n5519zqfpx6746434z505zc1krc";
name = "oxygen-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/oxygen-5.25.3.tar.xz";
sha256 = "0ynkmnmd1x36zn6x4chvpsrsi5rfqmk45qqxdx60x0w1hhi3x6bh";
name = "oxygen-5.25.3.tar.xz";
};
};
oxygen-sounds = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/oxygen-sounds-5.25.2.tar.xz";
sha256 = "13hhvfndz57gsdb70jnb12vcich4bfrm0rvb12zaza5j1qk939k7";
name = "oxygen-sounds-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/oxygen-sounds-5.25.3.tar.xz";
sha256 = "1hdqdq3qxpcyfs5gsmlpb3pjvixyr1ny4qwqq18givz8jbah3vkz";
name = "oxygen-sounds-5.25.3.tar.xz";
};
};
plasma-browser-integration = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-browser-integration-5.25.2.tar.xz";
sha256 = "0fyqd160c0ap3z8k2p16x4k8hvbdmnfp2hbx0p93d3acpi9vpqa3";
name = "plasma-browser-integration-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-browser-integration-5.25.3.tar.xz";
sha256 = "1krf9fchs3w0r1irzrdrxgwcgfsyhm2384q0c5vp5xg7dh10xvz2";
name = "plasma-browser-integration-5.25.3.tar.xz";
};
};
plasma-desktop = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-desktop-5.25.2.tar.xz";
sha256 = "09pnxh29xzag90sxdcjw8jafwrlpm8d4bl0xws74df94kqkcira1";
name = "plasma-desktop-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz";
sha256 = "134dgqqak5d3427znlj138f0k48qhkzs7pqi19yn89fbzw5vg8s8";
name = "plasma-desktop-5.25.3.tar.xz";
};
};
plasma-disks = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-disks-5.25.2.tar.xz";
sha256 = "1fvka372hjqb2m6m5479g9w9z96hygiaqm2jzh9f5qn6aj4baq84";
name = "plasma-disks-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-disks-5.25.3.tar.xz";
sha256 = "1dyxa5x4v6w8fn8956wcc9mvncnjf43cpn0algp54f9ndy1jaalw";
name = "plasma-disks-5.25.3.tar.xz";
};
};
plasma-firewall = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-firewall-5.25.2.tar.xz";
sha256 = "0gciy4nl7dcghgwcy7kx3zbsgvygs90wfrzr1nkk2vgphgvr4c6c";
name = "plasma-firewall-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-firewall-5.25.3.tar.xz";
sha256 = "0cwk4scadk4pd7v93arkrn1wgyc4d81995znp23vd9pmlaazyikv";
name = "plasma-firewall-5.25.3.tar.xz";
};
};
plasma-integration = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-integration-5.25.2.tar.xz";
sha256 = "1mvzxasr3m2jf7kvx5df0ijilbs7nvw3kxpsa543c2bmp6ib9zla";
name = "plasma-integration-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-integration-5.25.3.tar.xz";
sha256 = "1wsz0vbb0kj4542h7zca9yc6xz90ziv4lbm39d7dxr9hm94cdbjk";
name = "plasma-integration-5.25.3.tar.xz";
};
};
plasma-mobile = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-mobile-5.25.2.tar.xz";
sha256 = "0jgrw9wp0l289sygpr0mg7zcjg97bdgl039vdabf4ixd721swmz8";
name = "plasma-mobile-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-mobile-5.25.3.tar.xz";
sha256 = "1dzfbqg2zmdr0dlm99c3pj9iy6yagshlfj9x018sa0bzjysf29g3";
name = "plasma-mobile-5.25.3.tar.xz";
};
};
plasma-nano = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-nano-5.25.2.tar.xz";
sha256 = "1byhcnbjy691jkmhd7pch0rxhi6bbrzhzx47c97mqgxid5a8j0bk";
name = "plasma-nano-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-nano-5.25.3.tar.xz";
sha256 = "00m95c1cb3g8v8w0d4vnbnjhjmr5hw7gljn8nc705mpxsx03c3kd";
name = "plasma-nano-5.25.3.tar.xz";
};
};
plasma-nm = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-nm-5.25.2.tar.xz";
sha256 = "1hwxsprrwxap5q707jv9w8i7l3rql33dwh66fwqrjjm5v3ncac48";
name = "plasma-nm-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-nm-5.25.3.tar.xz";
sha256 = "0k8zwjjy8d5lp1slky13fx5j6kjsbs4irz3x5fm54aki15hdcjx7";
name = "plasma-nm-5.25.3.tar.xz";
};
};
plasma-pa = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-pa-5.25.2.tar.xz";
sha256 = "1k925flcmgi78rln7nb0vh43gdf1001wk68n3zdx6wmhscpbjwwd";
name = "plasma-pa-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-pa-5.25.3.tar.xz";
sha256 = "17881v0fff5mbgh6rgx4a2hk9m35flqijckwlyj2kcrcsqi3aq21";
name = "plasma-pa-5.25.3.tar.xz";
};
};
plasma-sdk = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-sdk-5.25.2.tar.xz";
sha256 = "15iaw4lggsmd4hhgdkwcp4q3j1y9rxjngc5gxh7ah28ijmq6fnr1";
name = "plasma-sdk-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-sdk-5.25.3.tar.xz";
sha256 = "1hhffvqvxlhdyg8v7b7drb0n4fnkxlvy0xfffnnln66pknxk7s5w";
name = "plasma-sdk-5.25.3.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-systemmonitor-5.25.2.tar.xz";
sha256 = "02jw59b7190wqkhyz4w8zcdydxpp9kq1dxd9x51wy0wpcp6igina";
name = "plasma-systemmonitor-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-systemmonitor-5.25.3.tar.xz";
sha256 = "07mxkm0ynq0xiqc1p4iqjc4c1x7198hr15r9ysajgs0sf9bcd6hx";
name = "plasma-systemmonitor-5.25.3.tar.xz";
};
};
plasma-tests = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-tests-5.25.2.tar.xz";
sha256 = "0zq4w8js35b9p0gih7x92iscmm2snwgm7bclrh29gvxyfsjir8wa";
name = "plasma-tests-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-tests-5.25.3.tar.xz";
sha256 = "0d7vhb75p2rhfbysa7bg80836ycryg4jcn91grag8y7pcq6m6zzn";
name = "plasma-tests-5.25.3.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-thunderbolt-5.25.2.tar.xz";
sha256 = "1mjh14yfap7jr181xvkar9hgmqzvghb4rs2d45b1ddwz3n340ak6";
name = "plasma-thunderbolt-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-thunderbolt-5.25.3.tar.xz";
sha256 = "05bdq7vdwpyyrfgvp48m8dbsjhvnaf84zhbcyjvjygvlhzdm8j57";
name = "plasma-thunderbolt-5.25.3.tar.xz";
};
};
plasma-vault = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-vault-5.25.2.tar.xz";
sha256 = "12z4kcrsp5jy16x4kssc9l7d2acbkg30jyg6f77jqh1ra671y1a5";
name = "plasma-vault-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-vault-5.25.3.tar.xz";
sha256 = "1phb7rygvm2c0n0yf5xyj3xpm1apfq3knfyiasgbjl4z6aimq406";
name = "plasma-vault-5.25.3.tar.xz";
};
};
plasma-workspace = {
version = "5.25.2";
version = "5.25.3.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-5.25.2.tar.xz";
sha256 = "16chbhmby9ixyh46xqsa0nd6yhpf3xlk2sv43g34my1hkhp63r6w";
name = "plasma-workspace-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-5.25.3.1.tar.xz";
sha256 = "09hgd1k0095s18a4147qihbsl5v8hadj7hm3zixf362sydgkal51";
name = "plasma-workspace-5.25.3.1.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plasma-workspace-wallpapers-5.25.2.tar.xz";
sha256 = "12r2zfz63xgfv0sxv1px7hbwan9pv3ik5h7lkfhcjbi9bhav2pyr";
name = "plasma-workspace-wallpapers-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-wallpapers-5.25.3.tar.xz";
sha256 = "15swpsqjdxxzkjw0phs4h7p3l4lfshsqv6pk3qbfbp91dd05cplh";
name = "plasma-workspace-wallpapers-5.25.3.tar.xz";
};
};
plymouth-kcm = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/plymouth-kcm-5.25.2.tar.xz";
sha256 = "04wfd5a63zbnvsngxpj0jvvhjhcchk2nd0ln8i2zdhhr0xlsbiw1";
name = "plymouth-kcm-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/plymouth-kcm-5.25.3.tar.xz";
sha256 = "0sb0gh0sh8lc13pbqkl8icjakzk0h7r3l6v3kwg0jyvmk0if1bpj";
name = "plymouth-kcm-5.25.3.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.25.2";
version = "1-5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/polkit-kde-agent-1-5.25.2.tar.xz";
sha256 = "1hcyw7qzryvqlszqv7lmhmhz7fbjd4961xq7hh18glm53rrz3z31";
name = "polkit-kde-agent-1-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/polkit-kde-agent-1-5.25.3.tar.xz";
sha256 = "0j067ps86zk38r0spcfpv33mxiagdnrkyy033v8gnsiayhrp9pcm";
name = "polkit-kde-agent-1-5.25.3.tar.xz";
};
};
powerdevil = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/powerdevil-5.25.2.tar.xz";
sha256 = "1ahq10mrnryq87ihj5b6a1ifjnyam7sxcgbr3avc2jpb4q8njmb6";
name = "powerdevil-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/powerdevil-5.25.3.tar.xz";
sha256 = "1lfws0rj2kbqvgm7gb4h6gmrpa71jbqgfmvmd2n4l9bxxx73rbh2";
name = "powerdevil-5.25.3.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/qqc2-breeze-style-5.25.2.tar.xz";
sha256 = "1l8133qlqhdq8y42yiy0njgfv9lzxlc6fdicfmr21bfvj3aj20mk";
name = "qqc2-breeze-style-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/qqc2-breeze-style-5.25.3.tar.xz";
sha256 = "1j714iaysfqkr997q94pv2abj433ps43myy37p8ss0v8pra9hn5c";
name = "qqc2-breeze-style-5.25.3.tar.xz";
};
};
sddm-kcm = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/sddm-kcm-5.25.2.tar.xz";
sha256 = "0idr9ckrbyh66m0lbza66z2v24pfzwx04np84242p79kyqgjlljf";
name = "sddm-kcm-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/sddm-kcm-5.25.3.tar.xz";
sha256 = "1mipvf25vjhdrww9cinp4v7g73swk364zfkyk4fypw8bccrbfpsd";
name = "sddm-kcm-5.25.3.tar.xz";
};
};
systemsettings = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/systemsettings-5.25.2.tar.xz";
sha256 = "1bz00nnrmpm2kjcapzaxkhx0j4a2vn0nhshgch65h7f3kjp4z0nm";
name = "systemsettings-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/systemsettings-5.25.3.tar.xz";
sha256 = "00n4r51qp03cwfsdrsza2nv5558zs8dyd6fywcycjd1ryqiyrl4r";
name = "systemsettings-5.25.3.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.25.2";
version = "5.25.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.25.2/xdg-desktop-portal-kde-5.25.2.tar.xz";
sha256 = "1sjm15z83s6vna78ffn390sdr4pnyw5yl8lq0jz79mkxyz2w4y2h";
name = "xdg-desktop-portal-kde-5.25.2.tar.xz";
url = "${mirror}/stable/plasma/5.25.3/xdg-desktop-portal-kde-5.25.3.tar.xz";
sha256 = "07pcpxq7j1b62wwds6q2niyh74dc9i2lwvka77g1ii55syybm7n7";
name = "xdg-desktop-portal-kde-5.25.3.tar.xz";
};
};
}
pkgs/development/compilers/crystal2nix/default.nix
+3 -4
View File
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "crystal2nix";
version = "0.1.1";
version = "0.3.0";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "crystal2nix";
rev = "v${version}";
sha256 = "sha256-LKZychkhWy/rVdrP3Yo6g8CL1pGdiZlBykzFjnWh0fg=";
hash = "sha256-gb2vgKWVXwYWfUUcFvOLFF0qB4CTBekEllpyKduU1Mo=";
};
format = "shards";
@@ -25,8 +25,7 @@ crystal.buildCrystalPackage rec {
# temporarily off. We need the checks to execute the wrapped binary
doCheck = false;
# it requires an internet connection when run
doInstallCheck = false;
doInstallCheck = true;
meta = with lib; {
description = "Utility to convert Crystal's shard.lock files to a Nix file";
pkgs/development/compilers/crystal2nix/shards.nix
+8 -10
View File
@@ -1,14 +1,12 @@
{
json_mapping = {
owner = "crystal-lang";
repo = "json_mapping.cr";
rev = "v0.1.0";
sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55";
spectator = {
url = "https://gitlab.com/arctic-fox/spectator.git";
rev = "v0.10.5";
sha256 = "1fgjz5vg59h4m25v4fjklimcdn62ngqbchm00kw1160ggjpgpzw2";
};
yaml_mapping = {
owner = "crystal-lang";
repo = "yaml_mapping.cr";
rev = "v0.1.0";
sha256 = "02spz1521g59ar6rp0znnr01di766kknbjxjnygs39yn0cmpzqc1";
version_from_shard = {
url = "https://github.com/hugopl/version_from_shard.git";
rev = "v1.2.5";
sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
};
}
pkgs/development/compilers/mono/6.nix
+2 -2
View File
@@ -2,8 +2,8 @@
callPackage ./generic.nix ({
inherit Foundation libobjc;
version = "6.12.0.122";
version = "6.12.0.182";
srcArchiveSuffix = "tar.xz";
sha256 = "sha256-KcJ3Zg/F51ExB67hy/jFBXyTcKTN/tovx4G+aYbYnSM=";
sha256 = "sha256-VzZqarTztezxEdSFSAMWFbOhANuHxnn8AG6Mik79lCQ=";
enableParallelBuilding = true;
})
pkgs/development/compilers/mono/generic.nix
+1 -2
View File
@@ -76,8 +76,7 @@ stdenv.mkDerivation rec {
inherit enableParallelBuilding;
meta = with lib; {
# Per nixpkgs#151720 the build failures for aarch64-darwin are fixed upstream, but a
# stable release with the fix is not available yet.
# Per nixpkgs#151720 the build failures for aarch64-darwin are fixed since 6.12.0.129
broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129";
homepage = "https://mono-project.com/";
description = "Cross platform, open source .NET development framework";
pkgs/development/compilers/zig/0.8.1.nix
-57
View File
@@ -1,57 +0,0 @@
{ lib
, fetchFromGitHub
, cmake
, llvmPackages
, libxml2
, zlib
}:
let
inherit (llvmPackages) stdenv;
in
stdenv.mkDerivation rec {
pname = "zig";
version = "0.8.1";
src = fetchFromGitHub {
owner = "ziglang";
repo = pname;
rev = version;
hash = "sha256-zMSOH8ZWcvzHRwOgGIbLO9Q6jf1P5QL5KCMD+frp+JA=";
};
nativeBuildInputs = [
cmake
llvmPackages.llvm.dev
];
buildInputs = [
libxml2
zlib
] ++ (with llvmPackages; [
libclang
lld
llvm
]);
preBuild = ''
export HOME=$TMPDIR;
'';
doCheck = true;
checkPhase = ''
runHook preCheck
./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig
runHook postCheck
'';
meta = with lib; {
homepage = "https://ziglang.org/";
description =
"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
license = licenses.mit;
maintainers = with maintainers; [ andrewrk AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299
};
}
pkgs/development/coq-modules/coqeal/default.nix
+2
View File
@@ -10,12 +10,14 @@ with lib;
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.13" "8.15") (isGe "1.13.0") ]; out = "1.1.1"; }
{ cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; }
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
{ cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; }
] null;
release."1.1.1".sha256 = "sha256-ExAdC3WuArNxS+Sa1r4x5aT7ylbCvP/BZXfkdQNAvZ8=";
release."1.1.0".sha256 = "1vyhfna5frkkq2fl1fkg2mwzpg09k3sbzxxpyp14fjay81xajrxr";
release."1.0.6".sha256 = "0lqkyfj4qbq8wr3yk8qgn7mclw582n3fjl9l19yp8cnchspzywx0";
release."1.0.5".sha256 = "0cmvky8glb5z2dy3q62aln6qbav4lrf2q1589f6h1gn5bgjrbzkm";
pkgs/development/haskell-modules/configuration-common.nix
+7 -25
View File
@@ -352,10 +352,14 @@ self: super: {
lvmrun = disableHardening ["format"] (dontCheck super.lvmrun);
matplotlib = dontCheck super.matplotlib;
brick_0_71_1 = super.brick_0_71_1.overrideScope (self: super: {
vty = self.vty_5_36;
});
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
# Needs brick ^>= 0.70
matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: {
brick = self.brick_0_70_1;
brick = self.brick_0_71_1;
}));
memcache = dontCheck super.memcache;
@@ -628,12 +632,6 @@ self: super: {
# 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2
jwt = dontCheck super.jwt;
# 2022-03-16: ghc 9 support has not been merged: https://github.com/hasura/monad-validate/pull/5
monad-validate = appendPatch (fetchpatch {
url = "https://github.com/hasura/monad-validate/commit/7ba916e23c219a8cd397e2a1801c74682b52fcf0.patch";
sha256 = "sha256-udJ+/2VvfWA5Bm36nftH0sbPNuMkWj8rCh9cNN2f9Zw=";
}) (dontCheck super.monad-validate);
# Build the latest git version instead of the official release. This isn't
# ideal, but Chris doesn't seem to make official releases any more.
structured-haskell-mode = overrideCabal (drv: {
@@ -1294,10 +1292,6 @@ self: super: {
# 2021-12-26: Too strict bounds on doctest
polysemy-plugin = doJailbreak super.polysemy-plugin;
# Test suite requires running a database server. Testing is done upstream.
hasql-notifications = dontCheck super.hasql-notifications;
hasql-pool = dontCheck super.hasql-pool;
# hasn‘t bumped upper bounds
# upstream: https://github.com/obsidiansystems/which/pull/6
which = doJailbreak super.which;
@@ -2558,21 +2552,9 @@ self: super: {
lsp-types = self.lsp-types_1_5_0_0;
});
# A delay between futhark package uploads caused us to end up with conflicting
# versions of futhark and futhark-manifest
futhark = assert super.futhark.version == "0.21.12"; overrideCabal (drv: {
editedCabalFile = null;
revision = null;
version = "0.21.13";
sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08";
libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [
self.fgl
self.fgl-visualize
self.co-log-core
];
}) (super.futhark.override {
futhark = super.futhark.override {
lsp = self.lsp_1_5_0_0;
});
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
-10
View File
@@ -155,16 +155,6 @@ self: super: {
] ++ drv.testFlags or [];
}) (doJailbreak super.hpack);
validity = pkgs.lib.pipe super.validity [
# head.hackage patch
(appendPatch (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/9110e6972b5daf085e19cad41f97920d3ddac499/patches/validity-0.12.0.0.patch";
sha256 = "0hzns596dxvyn8irgi7aflx76wak1qi13chkkvl0055pkgykm08f";
}))
# head.hackage ignores test suite
dontCheck
];
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_1_1;
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+3 -3
View File
@@ -821,7 +821,6 @@ broken-packages:
- config-parser
- Configurable
- configuration
- configurator-pg
- config-value-getopt
- confsolve
- congruence-relation
@@ -2073,7 +2072,6 @@ broken-packages:
- hasql-cursor-transaction
- hasql-explain-tests
- hasql-generic
- hasql-implicits
- hasql-resource-pool
- hasql-simple
- hasql-streams-example
@@ -2458,7 +2456,6 @@ broken-packages:
- hspec-snap
- hspec-structured-formatter
- hspec-tables
- hspec-wai-json
- HsPerl5
- hs-pgms
- hspkcs11
@@ -2677,6 +2674,7 @@ broken-packages:
- interval
- interval-algebra
- interval-patterns
- interval-tree-clock
- IntFormats
- int-multimap
- intricacy
@@ -4012,6 +4010,7 @@ broken-packages:
- postgresql-tx-simple
- postgresql-tx-squeal
- postgresql-typed-lifted
- postgrest
- postgres-tmp
- postgrest-ws
- postgres-websockets
@@ -4142,6 +4141,7 @@ broken-packages:
- push-notifications
- putlenses
- puzzle-draw
- pvector
- pyffi
- pyfi
- python-pickle
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+3
View File
@@ -141,6 +141,7 @@ extra-packages:
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
- vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1
package-maintainers:
abbradar:
@@ -347,6 +348,8 @@ package-maintainers:
- hercules-ci-cnix-store
- inline-c
- inline-c-cpp
roosemberth:
- git-annex
rvl:
- taffybar
- arbtt
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+16 -15
View File
@@ -1,4 +1,4 @@
# Stackage LTS 19.13
# Stackage LTS 19.14
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -279,7 +279,7 @@ default-package-overrides:
- cached-json-file ==0.1.1
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-alloy ==0.3.0.1
- call-alloy ==0.3.0.2
- call-stack ==0.4.0
- can-i-haz ==0.3.1.0
- capability ==0.5.0.1
@@ -720,7 +720,7 @@ default-package-overrides:
- extrapolate ==0.4.6
- fail ==4.9.0.0
- failable ==1.2.4.0
- fakedata ==1.0.2
- fakedata ==1.0.3
- fakedata-parser ==0.1.0.0
- fakedata-quickcheck ==0.2.0
- fakefs ==0.3.0.2
@@ -796,7 +796,7 @@ default-package-overrides:
- foundation ==0.0.28
- fourmolu ==0.4.0.0
- Frames ==0.7.3
- free ==5.1.8
- free ==5.1.9
- free-categories ==0.2.0.2
- freenect ==1.2.1
- freer-simple ==1.2.1.2
@@ -820,7 +820,7 @@ default-package-overrides:
- fuzzy ==0.1.0.1
- fuzzy-dates ==0.1.1.2
- fuzzyset ==0.2.3
- fuzzy-time ==0.2.0.0
- fuzzy-time ==0.2.0.1
- gauge ==0.2.5
- gd ==3000.7.3
- gdp ==0.0.3.0
@@ -1004,13 +1004,13 @@ default-package-overrides:
- haskintex ==0.8.0.0
- haskoin-core ==0.21.2
- hasktags ==0.72.0
- hasql ==1.5.0.4
- hasql ==1.5.0.5
- hasql-migration ==0.3.0
- hasql-notifications ==0.2.0.1
- hasql-optparse-applicative ==0.3.0.9
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
- hasql-th ==0.4.0.15
- hasql-th ==0.4.0.16
- hasql-transaction ==1.0.1.1
- has-transformers ==0.1.0.4
- hasty-hamiltonian ==1.3.4
@@ -1337,7 +1337,7 @@ default-package-overrides:
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.11.0
- kan-extensions ==5.2.4
- kan-extensions ==5.2.5
- kanji ==3.5.0
- katip ==0.8.7.2
- katip-logstash ==0.1.0.2
@@ -1536,7 +1536,7 @@ default-package-overrides:
- minio-hs ==1.6.0
- miniutter ==0.5.1.1
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.3
- mintty ==0.1.4
- missing-foreign ==0.1.1
- MissingH ==1.5.0.1
- mixed-types-num ==0.5.9.1
@@ -1943,6 +1943,7 @@ default-package-overrides:
- proto-lens-protoc ==0.7.1.1
- proto-lens-runtime ==0.7.0.2
- proto-lens-setup ==0.4.0.6
- protolude ==0.3.2
- proxied ==0.3.1
- psql-helpers ==0.1.0.0
- psqueues ==0.2.7.3
@@ -2067,7 +2068,7 @@ default-package-overrides:
- resistor-cube ==0.0.1.4
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
- resourcet ==1.2.5
- resourcet ==1.2.6
- result ==0.2.6.0
- retry ==0.9.2.1
- rev-state ==0.1.2
@@ -2304,7 +2305,7 @@ default-package-overrides:
- srt-attoparsec ==0.1.0.0
- srt-dhall ==0.1.0.0
- srt-formatting ==0.1.0.0
- stache ==2.3.2
- stache ==2.3.3
- stack-all ==0.4.0.1
- stack-clean-old ==0.4.6
- stackcollapse-ghc ==0.0.1.4
@@ -2376,7 +2377,7 @@ default-package-overrides:
- subcategories ==0.2.0.0
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
- superbuffer ==0.3.1.1
- superbuffer ==0.3.1.2
- svg-builder ==0.1.1
- SVGFonts ==1.8.0.1
- svg-tree ==0.6.2.4
@@ -2743,9 +2744,9 @@ default-package-overrides:
- wcwidth ==0.0.2
- webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1
- webgear-core ==1.0.2
- webgear-openapi ==1.0.2
- webgear-server ==1.0.2
- webgear-core ==1.0.3
- webgear-openapi ==1.0.3
- webgear-server ==1.0.3
- webpage ==0.0.5.1
- web-plugins ==0.4.1
- web-routes ==0.27.14.4
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+4 -4
View File
@@ -2026,7 +2026,6 @@ dont-distribute-packages:
- hasloGUI
- hasparql-client
- hasql-cursor-query
- hasql-dynamic-statements
- hasql-postgres
- hasql-postgres-options
- hasqlator-mysql
@@ -2418,6 +2417,10 @@ dont-distribute-packages:
- jobqueue
- join
- jordan-openapi
- jordan-servant
- jordan-servant-client
- jordan-servant-openapi
- jordan-servant-server
- jsc
- jsmw
- json-ast-json-encoder
@@ -3134,7 +3137,6 @@ dont-distribute-packages:
- postgresql-simple-typed
- postgresql-tx-query
- postgresql-tx-squeal-compat-simple
- postgrest
- postmark
- potoki
- potoki-cereal
@@ -3559,7 +3561,6 @@ dont-distribute-packages:
- shady-graphics
- shake-ats
- shake-bindist
- shake-futhark
- shake-minify-css
- shake-plus-extended
- shakebook
@@ -4054,7 +4055,6 @@ dont-distribute-packages:
- vty-ui-extras
- waargonaut
- wahsp
- wai-control
- wai-devel
- wai-dispatch
- wai-handler-snap
pkgs/development/haskell-modules/configuration-nix.nix
+8 -3
View File
@@ -167,9 +167,6 @@ self: super: builtins.intersectAttrs super {
digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql
hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema;
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
mongoDB = dontCheck super.mongoDB;
@@ -208,6 +205,14 @@ self: super: builtins.intersectAttrs super {
mustache = dontCheck super.mustache;
arch-web = dontCheck super.arch-web;
# Test suite requires running a database server. Testing is done upstream.
hasql = dontCheck super.hasql;
hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements;
hasql-interpolate = dontCheck super.hasql-interpolate;
hasql-notifications = dontCheck super.hasql-notifications;
hasql-pool = dontCheck super.hasql-pool;
hasql-transaction = dontCheck super.hasql-transaction;
# Tries to mess with extended POSIX attributes, but can't in our chroot environment.
xattr = dontCheck super.xattr;
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+605 -443
View File
File diff suppressed because it is too large Load Diff
pkgs/development/libraries/cimg/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "cimg";
version = "3.0.2";
version = "3.1.4";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk=";
hash = "sha256-nHYRs8X8I0B76SlgqWez3qubrsG7iBfa0I/G78v7H8g=";
};
outputs = [ "out" "doc" ];
pkgs/development/libraries/libfprint/default.nix
+2 -2
View File
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libfprint";
version = "1.94.3";
version = "1.94.4";
outputs = [ "out" "devdoc" ];
src = fetchFromGitLab {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "libfprint";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg=";
sha256 = "sha256-C8vBjk0cZm/GSqc6mgNbXG8FycnWRaXhj9wIrLcWzfE=";
};
nativeBuildInputs = [
pkgs/development/libraries/libressl/default.nix
+9
View File
@@ -92,5 +92,14 @@ in {
libressl_3_5 = generic {
version = "3.5.3";
hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg=";
patches = [
# Fix endianness detection on aarch64-darwin, issue #181187
(fetchpatch {
name = "fix-endian-header-detection.patch";
url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch";
sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE=";
})
];
};
}
pkgs/development/libraries/ntl/default.nix
+5
View File
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
dontAddPrefix = true; # DEF_PREFIX instead
# Written in perl, does not support autoconf-style
# --build=/--host= options:
# Error: unrecognized option: --build=x86_64-unknown-linux-gnu
configurePlatforms = [ ];
# reference: http://shoup.net/ntl/doc/tour-unix.html
configureFlags = [
"DEF_PREFIX=$(out)"
pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
sha256 = "NPMqd7j9Unvw8p/cUNMYWmgrb2ysdMvSSGJ6lJWh4/M=";
sha256 = "hY8QQVcP3E+GAdLOqtVbqCWBcxS2M6sMOr/vr+DryyQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/ailment/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.9";
version = "9.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-NvSbv/lMWEWZDHqo/peND8YsaZBKMm2SandDozyDoNs=";
hash = "sha256-l2rnCtzHeK9B/sb8EQUeTRiapE3Dzcysej1zqO0rrV0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/angr/default.nix
+2 -2
View File
@@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.2.9";
version = "9.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-8tIqAs3TPoc4G6h91Y7tQVy4KowmyJA5HwFbFwQTgjc=";
hash = "sha256-GkNpcYY9BEdLlWWOZQt2Ahdp8474RGbvV4UWTdBTKjc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/archinfo/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.9";
version = "9.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-TEW5aoBMBZCoW4nMFOVkg3xlHIM8TsKhdmijCoIOFoM=";
hash = "sha256-pd7QnJr+XXx+seGDlaLKBIew0Ldcnfsf7d1DgxZFREM=";
};
checkInputs = [
pkgs/development/python-modules/channels-redis/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "channels-redis";
version = "3.4.0";
version = "3.4.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version;
pname = "channels_redis";
sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc=";
sha256 = "sha256-eOSi8rKnRP5ah4SOw2te5J9SLGgIzv5sWDZj0NUx+qg=";
};
buildInputs = [ redis hiredis ];
pkgs/development/python-modules/claripy/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.9";
version = "9.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-8uavNI/Zhvt7jf8+bOvnExp7Jx/By+rgIc5MbNtrSdY=";
hash = "sha256-viQC8FgZ/La3fdlBcFd3Lm+YiiPzNyxw41caRfZU0/I=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cle/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.9";
version = "9.2.10";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
hash = "sha256-TnDJFBCejMyV6UdgvuywxXeE/OKe4XCE1+lIGl6YEjc=";
hash = "sha256-2B+yeQAWVTECW5M4/GFF4wvw3q6y/I6QQC+pYkUObN0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-spanner/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.15.1";
version = "3.16.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VmHmje3fJfiCT2CeJgk98qdFhZnxGZudfHP1MgW6Mtw=";
sha256 = "sha256-vkjAkxpk50zFVbhvdN76U5n6KbrTXilughac73La9yM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/meilisearch/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "meilisearch";
version = "0.18.3";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "v${version}";
hash = "sha256-Ym3AbIEf8eMSrtP8W1dPXqL0mTVN2bd8hlxdFhW/dkQ=";
rev = "refs/tags/v${version}";
hash = "sha256-ky5Z1bu+JFpnSGfzaEB6g/nl/F/QJQGVpgb+Jf/o/tM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyvex/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.9";
version = "9.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-QlgfiKQv1kMgGhtasOvuRFrciyFH7rsehbhOUxXSABk=";
hash = "sha256-0dUUEhkFedoZLW/HOhJQQgPmfcJbDYtyup4jCZBUhSI=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/sentry-sdk/default.nix
+2 -2
View File
@@ -46,7 +46,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.6.0";
version = "1.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = version;
hash = "sha256-X831uMlxvcgxQz8xWQZkJOp/fTmF62J95esJY23DZQw=";
hash = "sha256-Wee4toHLbiwYXMtsxALetAJ+JxxN/DsNPIiZeeWNuI0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/types-pyyaml/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pyyaml";
version = "6.0.8";
version = "6.0.9";
format = "setuptools";
src = fetchPypi {
pname = "types-PyYAML";
inherit version;
sha256 = "0f349hmw597f2gcja445fsrlnfzb0dj7fy62g8wcbydlgcvmsjfr";
sha256 = "sha256-M651yEuPYf3fDGPpx+VX252xaUrTwu6GKOxe/rtaXps=";
};
# Module doesn't have tests
pkgs/development/python-modules/types-redis/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.3.2";
version = "4.3.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oZNQj6poxT3sRcwwUV6rlMMxMlr4oMPIAJX2Dyq22qY=";
sha256 = "sha256-064pr/eZk2HJ+XlJi9LiV/ky9ikbh2qsC0S18AEGxuE=";
};
# Module doesn't have tests
pkgs/development/python-modules/types-setuptools/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-setuptools";
version = "62.6.0";
version = "62.6.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-x3oytRZ7ng2Zwfezm39aPsABxxCZMd1jxRZS+eRmPQc=";
sha256 = "sha256-r/2WijpyGOHJbxgG60V/QCfqyAOzyq3cz5ik5XdrFyQ=";
};
# Module doesn't have tests
pkgs/development/python-modules/zigpy-znp/default.nix
+3 -3
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "zigpy-znp";
version = "0.8.0";
version = "0.8.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "zigpy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sGwZL2AOCEWO9xl3HPHBGEFQ5NVk6CeuX9lt8ez8MFE=";
rev = "refs/tags/v${version}";
sha256 = "sha256-GKdhzmSQZ+D7o9OJZ5880mRI1mIcckW+dY5DnP7zIuo=";
};
propagatedBuildInputs = [
pkgs/development/tools/analysis/frama-c/default.nix
+9 -12
View File
@@ -4,15 +4,6 @@
, gdk-pixbuf, wrapGAppsHook
}:
let why3_1_5 = why3; in
let why3 = why3_1_5.overrideAttrs (o: rec {
version = "1.4.1";
src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz";
sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq";
};
}); in
let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
runtimeDeps = with ocamlPackages; [
@@ -24,9 +15,12 @@ let
mlgmpidl
num
ocamlgraph
ppx_deriving
ppx_import
stdlib-shims
why3
re
result
seq
sexplib
sexplib0
@@ -40,21 +34,24 @@ in
stdenv.mkDerivation rec {
pname = "frama-c";
version = "24.0";
slang = "Chromium";
version = "25.0";
slang = "Manganese";
src = fetchurl {
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
sha256 = "sha256:0x1xgip50jdz1phsb9rzwf2ra8lshn1hmd9g967xia402wrg3sjf";
sha256 = "sha256-Ii3O/NJyBTVAv1ts/zae/Ee4HCjzYOthZmnD8wqLwp8=";
};
preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
postConfigure = "patchShebangs src/plugins/value/gen-api.sh";
nativeBuildInputs = [ autoconf wrapGAppsHook ];
buildInputs = with ocamlPackages; [
ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip
lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen
ppx_deriving ppx_import
gdk-pixbuf
];
pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "drone-runner-docker";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "drone-runners";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F04h9kwrVvQEenzw1QTeNnQun9tHzu8HT24gNEMcRro=";
sha256 = "sha256-3SbvnW+mCwaBCF77rAnDMqZRHX9wDCjXvFGq9w0E5Qw=";
};
vendorSha256 = "sha256-E18ykjQc1eoHpviYok+NiLaeH01UMQmigl9JDwtR+zo=";
pkgs/development/tools/zls/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zls";
version = "unstable-2021-06-06";
version = "0.9.0";
src = fetchFromGitHub {
owner = "zigtools";
repo = pname;
rev = "39d87188647bd8c8eed304ee18f2dd1df6942f60";
sha256 = "sha256-22N508sVkP1OLySAijhtTPzk2fGf+FVnX9LTYRbRpB4=";
rev = version;
sha256 = "sha256-MVo21qNCZop/HXBqrPcosGbRY+W69KNCc1DfnH47GsI=";
fetchSubmodules = true;
};
pkgs/development/web/lucky-cli/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "lucky-cli";
version = "0.29.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "luckyframework";
repo = "lucky_cli";
rev = "v${version}";
sha256 = "sha256-OmvKd35jR003qQnA/NBI4MjGRw044bYUYa59RKbz+lI=";
hash = "sha256-fgrfVqRcb8xdvZ33XW3lBwR1GhjF/WeAglrPH2Fw31I=";
};
# the integration tests will try to clone a remote repos
pkgs/development/web/lucky-cli/shard.lock
+5 -1
View File
@@ -2,12 +2,16 @@ version: 2.0
shards:
ameba:
git: https://github.com/crystal-ameba/ameba.git
version: 0.14.3
version: 1.0.0
lucky_task:
git: https://github.com/luckyframework/lucky_task.git
version: 0.1.1
nox:
git: https://github.com/matthewmcgarvey/nox.git
version: 0.2.0
teeplate:
git: https://github.com/luckyframework/teeplate.git
version: 0.8.5
pkgs/development/web/lucky-cli/shards.nix
+10 -8
View File
@@ -1,19 +1,21 @@
{
ameba = {
owner = "crystal-ameba";
repo = "ameba";
rev = "v0.14.3";
sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1";
url = "https://github.com/crystal-ameba/ameba.git";
rev = "v1.0.0";
sha256 = "01cgapdpk8dg7sdgnq6ql42g3kv5z2fmsc90z07d9zvjp9vs2idp";
};
lucky_task = {
owner = "luckyframework";
repo = "lucky_task";
url = "https://github.com/luckyframework/lucky_task.git";
rev = "v0.1.1";
sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7";
};
nox = {
url = "https://github.com/matthewmcgarvey/nox.git";
rev = "v0.2.0";
sha256 = "041wh7nbi8jxg314p5s4080ll9ywc48knpxmrzwj5h4rgmk7g231";
};
teeplate = {
owner = "luckyframework";
repo = "teeplate";
url = "https://github.com/luckyframework/teeplate.git";
rev = "v0.8.5";
sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj";
};
pkgs/games/steam/fhsenv.nix
+2
View File
@@ -195,6 +195,8 @@ in buildFHSUserEnv rec {
SDL2_ttf
SDL2_mixer
libappindicator-gtk2
libdbusmenu-gtk2
libindicator-gtk2
libcaca
libcanberra
libgcrypt
pkgs/misc/pylode/default.nix
+3 -3
View File
@@ -5,7 +5,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "pylode";
version = "2.12.0";
version = "2.13.3";
format = "setuptools";
disabled = python3.pythonOlder "3.6";
@@ -13,8 +13,8 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "RDFLib";
repo = pname;
rev = version;
sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8=";
rev = "refs/tags/${version}";
sha256 = "sha256-AtqkxnpEL+580S/iKCaRcsQO6LLYhkJxyNx6fi3atbE=";
};
propagatedBuildInputs = with python3.pkgs; [
pkgs/os-specific/linux/kernel/zen-kernels.nix
+5 -5
View File
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "5.18.10"; #zen
version = "5.18.11"; #zen
suffix = "zen1"; #zen
sha256 = "0kqzs3g9w1sfin61sapc403pc65acsy18qk8ldkhzhjzv90fw4im"; #zen
sha256 = "11dp4wxn4ilndzpp16aazf7569w3r46qh31f5lhbryqwfpa8vzb1"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "5.18.10"; #lqx
version = "5.18.11"; #lqx
suffix = "lqx1"; #lqx
sha256 = "0b666lwqhiydkikca2x55ljgpw9sba8r7jvcvp6nghm4yf3a11mp"; #lqx
sha256 = "0q0n88sszq6kpy3s0n0a8nd0rxa7xh4hklkbvv8z2r43l8d4zazr"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
@@ -32,7 +32,7 @@ let
extraMeta = {
branch = lib.versions.majorMinor version + "/master";
maintainers = with lib.maintainers; [ atemu andresilva psydvl ];
maintainers = with lib.maintainers; [ atemu andresilva pedrohlc psydvl ];
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." +
lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)";
};
pkgs/tools/X11/ffcast/default.nix
+19 -9
View File
@@ -1,30 +1,40 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, perl
, ffmpeg, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo
}:
stdenv.mkDerivation rec {
pname = "ffcast";
version = "2.5.0";
src = fetchFromGitHub {
owner = "lolilolicon";
owner = "ropery";
repo = "FFcast";
rev = version;
sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ perl libX11 ];
nativeBuildInputs = [ autoreconfHook makeWrapper perl /*for pod2man*/ ];
configureFlags = [ "--disable-xrectsel" ];
postBuild = ''
make install
postInstall = let
binPath = lib.makeBinPath [
ffmpeg
imagemagick
xdpyinfo
xprop
xrectsel
xwininfo
];
in ''
wrapProgram $out/bin/ffcast --prefix PATH : ${binPath}
'';
meta = with lib; {
description = "Run commands on rectangular screen regions";
homepage = "https://github.com/lolilolicon/FFcast";
license = licenses.gpl3;
maintainers = [ maintainers.guyonvarch ];
homepage = "https://github.com/ropery/FFcast";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
};
}
pkgs/tools/X11/xrectsel/default.nix
+4 -8
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.3.2";
src = fetchFromGitHub {
owner = "lolilolicon";
owner = "ropery";
repo = "xrectsel";
rev = version;
sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
@@ -14,15 +14,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libX11 ];
postBuild = ''
make install
'';
meta = with lib; {
description = "Print the geometry of a rectangular screen region";
homepage = "https://github.com/lolilolicon/xrectsel";
license = licenses.gpl3;
maintainers = [ maintainers.guyonvarch ];
homepage = "https://github.com/ropery/xrectsel";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
};
}
pkgs/tools/admin/trivy/default.nix
+3 -3
View File
@@ -6,15 +6,15 @@
buildGoModule rec {
pname = "trivy";
version = "0.29.1";
version = "0.29.2";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-L1MjPgypKWVTdR16grloRY1JoJ6giXqihsWFa8yWXd0=";
sha256 = "sha256-IZ94kYnZ1iNX4sgYF/XvRNvycXJ4fNmRwFgSpYcSopU=";
};
vendorSha256 = "sha256-wM8OOOVw8Pb37/JMpz0AWbpJyHeDBQ0+DO15AiDduUU=";
vendorSha256 = "sha256-C1dOeVt+ocqj3s3tSXn8B/vHTRRWj8XU5RWmlQ0lZdA=";
excludedPackages = "misc";
pkgs/tools/graphics/agi/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
version = "3.1.0-dev-20220314";
version = "3.1.0-dev-20220627";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-j/ozkIoRM+G7fi0qBG8UGKPtrn6DR6KNK0Hc53dxsMw=";
sha256 = "sha256-gJ7vz95KqmTQp+sf1q99Sk7aYooLHVAyYliKzfM/fWU=";
};
nativeBuildInputs = [
pkgs/tools/graphics/gmic-qt/default.nix
+14 -68
View File
@@ -1,10 +1,10 @@
{ lib
, mkDerivation
, fetchurl
, variant ? "standalone"
, fetchFromGitHub
, cmake
, pkg-config
, ninja
, opencv3
, openexr
, graphicsmagick
@@ -16,6 +16,8 @@
, curl
, krita ? null
, gimp ? null
, gmic
, cimg
, qtbase
, qttools
, writeShellScript
@@ -56,48 +58,24 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps
mkDerivation rec {
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
version = "3.0.0";
version = "3.1.5";
gmic-community = fetchFromGitHub {
owner = "dtschump";
repo = "gmic-community";
rev = "df23b08bc52767762f0e38d040cd8ffeea4b865e";
sha256 = "euk5RsFPBgx2czAukPRdi/O4ahgXO8J8VJdiGHNge5M=";
};
CImg = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
sha256 = "dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg=";
};
gmic_stdlib = fetchurl {
name = "gmic_stdlib.h";
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
sha256 = "CAYSxw5NCmE29hie1/J1csBcdQvIrmZ/+mNMl0sLLGI=";
};
gmic = fetchFromGitHub {
owner = "dtschump";
repo = "gmic";
rev = "v.${version}";
sha256 = "PyeJmjOqjbHlZ1Xl3IpoOD6oZEcUrHNHqF7Ft1RZDL4=";
};
gmic_qt = fetchFromGitHub {
src = fetchFromGitHub {
owner = "c-koi";
repo = "gmic-qt";
rev = "v.${version}";
sha256 = "nENXumOArRAHENqnBUjM7m+I5hf/WAFTVfm6cJgnv+0=";
sha256 = "rSBdh6jhiVZogZADEKn3g7bkGPnWWOEnRF0jNCe1BCk=";
};
nativeBuildInputs = [
cmake
pkg-config
ninja
];
buildInputs = [
gmic
cimg
qtbase
qttools
fftw
@@ -113,18 +91,13 @@ mkDerivation rec {
cmakeFlags = [
"-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}"
"-DENABLE_SYSTEM_GMIC:BOOL=ON"
];
unpackPhase = ''
cp -r ${gmic} gmic
ln -s ${gmic-community} gmic-community
cp -r ${gmic_qt} gmic_qt
chmod -R +w gmic gmic_qt
ln -s ${CImg} CImg
cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
cd gmic_qt
postPatch = ''
patchShebangs \
translations/filters/csv2ts.sh \
translations/lrelease.sh
'';
postFixup = lib.optionalString (variant == "gimp") ''
@@ -132,33 +105,6 @@ mkDerivation rec {
wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt"
'';
passthru = {
updateScript = writeShellScript "${pname}-update-script" ''
set -o errexit
PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]}
latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' | sort --numeric-sort --reverse | head -n1)
if [[ "${version}" = "$latestVersion" ]]; then
echo "The new version same as the old version."
exit 0
fi
# gmic-community is not versioned so let’s just update to master.
communityLatestCommit=$(curl "https://api.github.com/repos/dtschump/gmic-community/commits/master")
communityLatestSha=$(echo "$communityLatestCommit" | jq .sha --raw-output)
communityLatestDate=$(echo "$communityLatestCommit" | jq .commit.committer.date --raw-output | sed 's/T.\+//')
update-source-version --source-key=gmic-community "gmic-qt" "unstable-$communityLatestDate" --rev="$communityLatestSha"
for component in CImg gmic_stdlib gmic gmic_qt; do
# The script will not perform an update when the version attribute is up to date from previous platform run
# We need to clear it before each run
update-source-version "--source-key=$component" "gmic-qt" 0 "$(printf '0%.0s' {1..64})"
update-source-version "--source-key=$component" "gmic-qt" $latestVersion
done
'';
};
meta = with lib; {
description = variants.${variant}.description;
homepage = "http://gmic.eu/";
pkgs/tools/graphics/gmic/default.nix
+56 -5
View File
@@ -1,4 +1,6 @@
{ lib, stdenv
{ stdenv
, lib
, fetchFromGitHub
, fetchurl
, cmake
, ninja
@@ -6,22 +8,40 @@
, opencv
, openexr
, graphicsmagick
, cimg
, fftw
, zlib
, libjpeg
, libtiff
, libpng
, writeShellScript
, common-updater-scripts
, curl
, gnugrep
, gnused
, coreutils
, jq
}:
stdenv.mkDerivation rec {
pname = "gmic";
version = "3.0.0";
version = "3.1.5";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
sha256 = "sha256-PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA=";
src = fetchFromGitHub {
owner = "dtschump";
repo = "gmic";
rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d";
sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0=";
};
# TODO: build this from source
# https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729
gmic_stdlib = fetchurl {
name = "gmic_stdlib.h";
url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
sha256 = "FM8RscCrt6jYlwVB2DtpqYrh9B3pO0I6Y69tkf9W1/o=";
};
nativeBuildInputs = [
@@ -31,6 +51,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
cimg
fftw
zlib
libjpeg
@@ -45,8 +66,38 @@ stdenv.mkDerivation rec {
"-DBUILD_LIB_STATIC=OFF"
"-DENABLE_CURL=OFF"
"-DENABLE_DYNAMIC_LINKING=ON"
"-DUSE_SYSTEM_CIMG=ON"
];
postPatch = ''
# TODO: build from source
cp -r ${gmic_stdlib} src/gmic_stdlib.h
# CMake build files were moved to subdirectory.
mv resources/CMakeLists.txt resources/cmake .
'';
passthru = {
updateScript = writeShellScript "${pname}-update-script" ''
set -o errexit
PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]}
latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' | sort --numeric-sort --reverse | head -n1)
if [[ "${version}" = "$latestVersion" ]]; then
echo "The new version same as the old version."
exit 0
fi
for component in src gmic_stdlib; do
# The script will not perform an update when the version attribute is up to date from previous platform run
# We need to clear it before each run
update-source-version "--source-key=$component" "gmic" 0 "$(printf '0%.0s' {1..64})"
update-source-version "--source-key=$component" "gmic" $latestVersion
done
'';
};
meta = with lib; {
description = "Open and full-featured framework for image processing";
homepage = "https://gmic.eu/";
pkgs/tools/misc/figlet/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch }:
{ lib, stdenv, fetchurl, fetchpatch, fetchzip }:
stdenv.mkDerivation rec {
pname = "figlet";
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
};
contributed = fetchzip {
url = "ftp://ftp.figlet.org/pub/figlet/fonts/contributed.tar.gz";
hash = "sha256-AyvAoc3IqJeKWgJftBahxb/KJjudeJIY4KD6mElNagQ=";
};
patches = [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399";
@@ -20,12 +25,15 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ];
postInstall = "cp -ar ${contributed}/* $out/share/figlet/";
doCheck = true;
meta = {
description = "Program for making large letters out of ordinary text";
homepage = "http://www.figlet.org/";
license = lib.licenses.afl21;
maintainers = with lib.maintainers; [ ehmry ];
platforms = lib.platforms.unix;
};
}
pkgs/tools/misc/ncdu/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ncdu";
version = "1.16";
version = "1.17";
src = fetchurl {
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
sha256 = "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b";
sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E=";
};
buildInputs = [ ncurses ];
pkgs/tools/misc/phrase-cli/default.nix
+5 -3
View File
@@ -2,16 +2,18 @@
buildGoModule rec {
pname = "phrase-cli";
version = "2.4.4";
version = "2.4.12";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
sha256 = "0xlfcj0jd6x4ynzg6d0p3wlmfq660w3zm13nzx04jfcjnks9sqvl";
sha256 = "sha256-+/hs6v3ereja2NtGApVBA3rTib5gAiGndbDg+FybWco=";
};
vendorSha256 = "1ablrs3prw011bpad8vn87y3c81q44mps873nhj278hlkz6im34g";
vendorSha256 = "sha256-Pt+F2ICuOQZBjMccK1qq/ueGOvnjDmAM5YLRINk2u/g=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
postInstall = ''
ln -s $out/bin/phrase-cli $out/bin/phrase
pkgs/tools/networking/wakeonlan/default.nix
+5 -3
View File
@@ -2,18 +2,20 @@
perlPackages.buildPerlPackage rec {
pname = "wakeonlan";
version = "0.41";
version = "0.42";
src = fetchFromGitHub {
owner = "jpoliv";
repo = pname;
rev = "wakeonlan-${version}";
sha256 = "0m48b39lz0yc5ckx2jx8y2p4c8npjngxl9wy86k43xgsd8mq1g3c";
rev = "v${version}";
sha256 = "sha256-zCOpp5iNrWwh2knBGWhiEyG9IPAnFRwH5jJLEVLBISM=";
};
outputs = [ "out" ];
nativeBuildInputs = [ installShellFiles ];
# checkInputs = [ perl534Packages.TestPerlCritic perl534Packages.TestPod perl534Packages.TestPodCoverage ];
doCheck = false; # Missing package for https://github.com/genio/test-spelling to run tests
installPhase = ''
install -Dt $out/bin wakeonlan
pkgs/tools/security/exploitdb/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-07-02";
version = "2022-07-12";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1iUlbkdC7lLxBI/zb135l61foH2A2pTOz34YjQhym2g=";
hash = "sha256-fnhiLB5Ga2yWhj0/w94d9gl874ekPJBwiIgK8DapN+w=";
};
nativeBuildInputs = [
pkgs/tools/security/fprintd/tod.nix
+37 -7
View File
@@ -1,21 +1,51 @@
{ fetchFromGitLab
{ lib
, fetchFromGitLab
, fetchpatch
, fprintd
, libfprint-tod
}:
(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs:
let
(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec {
pname = "fprintd-tod";
version = "1.90.9";
in
{
inherit pname version;
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = "${oldAttrs.pname}";
repo = "fprintd";
rev = "v${version}";
sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
};
patches = oldAttrs.patches or [] ++ [
(fetchpatch {
name = "use-more-idiomatic-correct-embedded-shell-scripting";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch";
sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek=";
})
(fetchpatch {
name = "remove-pointless-copying-of-files-into-build-directory";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch";
sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4=";
})
(fetchpatch {
name = "build-Do-not-use-positional-arguments-in-i18n.merge_file";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch";
sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes=";
})
];
postPatch = oldAttrs.postPatch or "" + ''
# part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
mv src/device.xml src/net.reactivated.Fprint.Device.xml
mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
'';
meta = {
homepage = "https://fprint.freedesktop.org/";
description = "fprintd built with libfprint-tod to support Touch OEM Drivers";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ hmenke ];
};
})
pkgs/tools/system/netdata/default.nix
+15 -7
View File
@@ -1,12 +1,15 @@
{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper
, CoreFoundation, IOKit, libossp_uuid
, nixosTests
, curl, libcap, libuuid, lm_sensors, zlib, protobuf
, curl, jemalloc, libuv, zlib
, libcap, libuuid, lm_sensors, protobuf
, withCups ? false, cups
, withDBengine ? true, libuv, lz4, judy
, withDBengine ? true, judy, lz4
, withIpmi ? (!stdenv.isDarwin), freeipmi
, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
, withCloud ? (!stdenv.isDarwin), json_c
, withConnPubSub ? false, google-cloud-cpp, grpc
, withConnPrometheus ? false, snappy
, withSsl ? true, openssl
, withDebug ? false
}:
@@ -30,14 +33,17 @@ in stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ];
buildInputs = [ curl.dev zlib.dev protobuf ]
buildInputs = [ curl.dev jemalloc libuv zlib.dev ]
++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ]
++ optionals withCups [ cups ]
++ optionals withDBengine [ libuv lz4.dev judy ]
++ optionals withDBengine [ judy lz4.dev ]
++ optionals withIpmi [ freeipmi ]
++ optionals withNetfilter [ libmnl libnetfilter_acct ]
++ optionals withCloud [ json_c ]
++ optionals withConnPubSub [ google-cloud-cpp grpc ]
++ optionals withConnPrometheus [ snappy ]
++ optionals (withCloud || withConnPrometheus) [ protobuf ]
++ optionals withSsl [ openssl.dev ];
patches = [
@@ -92,9 +98,11 @@ in stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-ebpf"
] ++ optionals withCloud [
"--enable-cloud"
"--with-aclk-ng"
"--with-jemalloc=${jemalloc}"
] ++ optional (!withDBengine) [
"--disable-dbengine"
] ++ optional (!withCloud) [
"--disable-cloud"
];
postFixup = ''
pkgs/top-level/all-packages.nix
+9 -8
View File
@@ -6154,7 +6154,7 @@ with pkgs;
};
lp_solve = callPackage ../applications/science/math/lp_solve {
inherit (darwin) cctools;
inherit (darwin) cctools autoSignDarwinBinariesHook;
};
fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
@@ -16859,9 +16859,7 @@ with pkgs;
ytt = callPackage ../development/tools/ytt {};
zls = callPackage ../development/tools/zls {
zig = zig_0_8_1;
};
zls = callPackage ../development/tools/zls { };
zydis = callPackage ../development/libraries/zydis { };
@@ -17749,7 +17747,11 @@ with pkgs;
ghcid = haskellPackages.ghcid.bin;
graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
graphia = libsForQt514.callPackage ../applications/science/misc/graphia {
# Using gcc 10 because this fails to build with gcc 11
# Error similar to this https://github.com/RPCS3/rpcs3/issues/10291
stdenv = gcc10Stdenv;
};
icon-lang = callPackage ../development/interpreters/icon-lang { };
@@ -21678,9 +21680,6 @@ with pkgs;
zig = callPackage ../development/compilers/zig {
llvmPackages = llvmPackages_13;
};
zig_0_8_1 = callPackage ../development/compilers/zig/0.8.1.nix {
llvmPackages = llvmPackages_12;
};
zimlib = callPackage ../development/libraries/zimlib { };
@@ -28486,6 +28485,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
media-downloader = callPackage ../applications/video/media-downloader { };
mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { };
mediainfo = callPackage ../applications/misc/mediainfo { };
pkgs/top-level/release-cross.nix
+7
View File
@@ -1,4 +1,11 @@
/* This file defines some basic smoke tests for cross compilation.
Individual jobs can be tested by running:
$ nix-build pkgs/top-level/release-cross.nix -A <jobname>.<package> --arg supportedSystems '[builtins.currentSystem]'
e.g.
$ nix-build pkgs/top-level/release-cross.nix -A crossMingw32.nixUnstable --arg supportedSystems '[builtins.currentSystem]'
*/
{ # The platforms *from* which we cross compile.