BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-10-28 00:02:23 +00:00 committed by GitHub
commit 4791949f6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 436 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
maintainers/maintainer-list.nix
View file

@ -7466,6 +7466,12 @@
githubId = 25505957;
name = "Ilian";
};
iliayar = {
email = "iliayar3@gmail.com";
github = "iliayar";
githubId = 17529355;
name = "Ilya Yaroshevskiy";
};
ilikeavocadoes = {
email = "ilikeavocadoes@hush.com";
github = "ilikeavocadoes";
@ -9782,6 +9788,11 @@
}];
name = "Joseph LaFreniere";
};
lagoja = {
github = "Lagoja";
githubId =750845;
name = "John Lago";
};
laikq = {
email = "gwen@quasebarth.de";
github = "laikq";

8
nixos/modules/services/networking/tailscale.nix
View file

@ -31,6 +31,12 @@ in {
package = lib.mkPackageOptionMD pkgs "tailscale" {};
openFirewall = mkOption {
default = false;
type = types.bool;
description = lib.mdDoc "Whether to open the firewall for the specified port.";
};
useRoutingFeatures = mkOption {
type = types.enum [ "none" "client" "server" "both" ];
default = "none";
@ -113,6 +119,8 @@ in {
"net.ipv6.conf.all.forwarding" = mkOverride 97 true;
};
networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ cfg.port ];
networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose";
networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ];

6
nixos/modules/services/web-apps/plausible.nix
View file

@ -78,9 +78,9 @@ in {
server = {
disableRegistration = mkOption {
default = true;
type = types.bool;
type = types.enum [true false "invite_only"];
description = lib.mdDoc ''
Whether to prohibit creating an account in plausible's UI.
Whether to prohibit creating an account in plausible's UI or allow on `invite_only`.
'';
};
secretKeybaseFile = mkOption {
@ -209,7 +209,7 @@ in {
# Configuration options from
# https://plausible.io/docs/self-hosting-configuration
PORT = toString cfg.server.port;
DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration;
DISABLE_REGISTRATION = if isBool cfg.server.disableRegistration then boolToString cfg.server.disableRegistration else cfg.server.disableRegistration;
RELEASE_TMP = "/var/lib/plausible/tmp";
# Home is needed to connect to the node with iex

1
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -35,6 +35,7 @@ let
compressMimeTypes = [
"application/atom+xml"
"application/geo+json"
"application/javascript" # Deprecated by IETF RFC 9239, but still widely used
"application/json"
"application/ld+json"
"application/manifest+json"

23
pkgs/applications/audio/youtube-music/default.nix
View file

@ -4,6 +4,7 @@
, makeWrapper
, electron_25
, python3
, stdenv
, copyDesktopItems
, makeDesktopItem
}:
@ -22,10 +23,11 @@ let
electron = electron_25;
in
buildNpmPackage rec {
buildNpmPackage {
inherit pname version src;
nativeBuildInputs = [ makeWrapper python3 copyDesktopItems ];
nativeBuildInputs = [ makeWrapper python3 ]
++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ];
npmDepsHash = "sha256-XGV0mTywYYxpMitojzIILB/Eu/8dfk/aCvUxIkx4SDQ=";
makeCacheWritable = true;
@ -34,16 +36,24 @@ buildNpmPackage rec {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
};
postBuild = ''
postBuild = lib.optionalString stdenv.isDarwin ''
cp -R ${electron}/Applications/Electron.app Electron.app
chmod -R u+w Electron.app
'' + ''
npm exec electron-builder -- \
--dir \
-c.electronDist=${electron}/libexec/electron \
-c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \
-c.electronVersion=${electron.version}
'';
installPhase = ''
runHook preInstall
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/{Applications,bin}
mv pack/mac*/YouTube\ Music.app $out/Applications
makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music
'' + lib.optionalString (!stdenv.isDarwin) ''
mkdir -p "$out/share/lib/youtube-music"
cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music"
@ -52,11 +62,12 @@ buildNpmPackage rec {
install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/youtube-music.png
done
popd
'' + ''
runHook postInstall
'';
postFixup = ''
postFixup = lib.optionalString (!stdenv.isDarwin) ''
makeWrapper ${electron}/bin/electron $out/bin/youtube-music \
--add-flags $out/share/lib/youtube-music/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
@ -80,8 +91,8 @@ buildNpmPackage rec {
description = "Electron wrapper around YouTube Music";
homepage = "https://th-ch.github.io/youtube-music/";
license = licenses.mit;
inherit (electron.meta) platforms;
maintainers = [ maintainers.aacebedo ];
mainProgram = "youtube-music";
platforms = platforms.all;
};
}

4
pkgs/applications/misc/spicetify-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.25.0";
version = "2.25.1";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
hash = "sha256-unw+MtV1SKkDSXbLFLAa0+Xtm/k1Cx8V0bb9NJrFuxU=";
hash = "sha256-81dfAekWvMcp1Jar+jlXRiJr6UmHCdJZ0ML/6fFnvRs=";
};
vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc=";

6
pkgs/applications/misc/usql/default.nix
View file

@ -10,18 +10,18 @@
buildGoModule rec {
pname = "usql";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
hash = "sha256-thpVcJ1HRhoOAli7829zM4fermEcS9FwzKX7ZjHGhZg=";
hash = "sha256-SJypezOTQr+TiG/rePXxgjrspeErqj6qw9TBen41e4Q=";
};
buildInputs = [ unixODBC icu ];
vendorHash = "sha256-S7fahA+ykviQoWc7p0CcTGfouswxQNBn4HH+tbl0fbI=";
vendorHash = "sha256-i2lH6ajRmfJHsh7nzCjt7mi3issA4kSBdG42w67pOC4=";
proxyVendor = true;
# Exclude broken genji, hive & impala drivers (bad group)

6
pkgs/applications/networking/cluster/nerdctl/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.6.0";
version = "1.6.2";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-O1N8+Gjo0EapRV5Z7Z27Cfs886cbwTmckJsSJ2OI5fM=";
hash = "sha256-izFDqaJFJrgeb3YPP/7rIf/IjvrtlwjbktNy702zVTU=";
};
vendorHash = "sha256-/4XFQagUbU8SgoBogK1hAsfGoTY+DaIVaNpSA3Enaho=";
vendorHash = "sha256-4I+qCh/A/Yj5kUZLFvXTUV85l/2LVGPUCivTdDlA1ao=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

13
pkgs/applications/networking/freefilesync/default.nix
View file

@ -15,9 +15,16 @@
, makeDesktopItem
}:
let
wxGTK32' = wxGTK32.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [
"--disable-exceptions"
];
});
in
stdenv.mkDerivation (finalAttrs: {
pname = "freefilesync";
version = "13.0";
version = "13.1";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@ -26,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -f $out
tryDownload "$url"
'';
hash = "sha256-E0lYKNCVtkdnhI3NPx8828Fz6sfmIm18KSC0NSWgHfQ=";
hash = "sha256-xuJQOegmZHPsCmJU2akTD4nQh05M+rpnjQVEer33SCk=";
};
sourceRoot = ".";
@ -63,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
libssh2
openssl
wxGTK32
wxGTK32'
];
env.NIX_CFLAGS_COMPILE = toString [

3
pkgs/applications/science/chemistry/cp2k/default.nix
View file

@ -146,7 +146,8 @@ stdenv.mkDerivation rec {
-fopenmp -ftree-vectorize -funroll-loops \
-I${lib.getDev libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \
-I${lib.getDev sirius}/include/sirius \
-I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include
-I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include \
-fallow-argument-mismatch
LIBS = -lfftw3 -lfftw3_threads \
-lscalapack -lblas -llapack \
-lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \

20
pkgs/applications/video/kodi/addons/invidious/default.nix
View file

@ -1,18 +1,13 @@
{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }:
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }:
buildKodiAddon rec {
pname = "invidious";
namespace = "plugin.video.invidious";
version = "unstable-2022-11-28";
version = "0.2.6";
# video search doesn't work for the version on kodi.tv
# if the result contains channels
# https://github.com/TheAssassin/kodi-invidious-plugin/issues/17
src = fetchFromGitHub {
owner = "TheAssassin";
repo = "kodi-invidious-plugin";
rev = "85b66525632d94630c9301d9c490fc002a335d77";
hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws=";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip";
sha256 = "sha256-XnlnhvtHMh4uQTupW/SSOmaEV8xZrL61/6GoRpyKR0o=";
};
propagatedBuildInputs = [
@ -23,10 +18,13 @@ buildKodiAddon rec {
passthru = {
pythonPath = "resources/lib";
updateScript = addonUpdateScript {
attrPath = "kodi.packages.invidious";
};
};
meta = with lib; {
homepage = "https://github.com/TheAssassin/kodi-invidious-plugin";
homepage = "https://github.com/petterreinholdtsen/kodi-invidious-plugin";
description = "A privacy-friendly way of watching YouTube content";
license = licenses.mit;
maintainers = teams.kodi.members;

4
pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
View file

@ -6,13 +6,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-iptvsimple";
namespace = "pvr.iptvsimple";
version = "20.11.0";
version = "20.11.1";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.iptvsimple";
rev = "${version}-${rel}";
sha256 = "sha256-58Dma0UtD6Uy4zu4aQT2FY0emLiQpA4RChhnneMzFZI=";
sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio=";
};
extraBuildInputs = [

31
pkgs/applications/video/mpv/scripts/chapterskip.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib
, fetchFromGitHub
, nix-update-script
, stdenvNoCC }:
stdenvNoCC.mkDerivation {
pname = "chapterskip";
passthru.scriptName = "chapterskip.lua";
version = "unstable-2022-09-08";
src = fetchFromGitHub {
owner = "po5";
repo = "chapterskip";
rev = "b26825316e3329882206ae78dc903ebc4613f039";
hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90=";
};
dontBuild = true;
preferLocalBuild = true;
installPhase = "install -Dt $out/share/mpv/scripts chapterskip.lua";
passthru.updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
};
meta = with lib; {
homepage = "https://github.com/po5/chapterskip";
platforms = platforms.all;
maintainers = with maintainers; [ nicoo ];
};
}

1
pkgs/applications/video/mpv/scripts/default.nix
View file

@ -9,6 +9,7 @@ lib.recurseIntoAttrs
autocrop = callPackage ./autocrop.nix { };
autodeint = callPackage ./autodeint.nix { };
autoload = callPackage ./autoload.nix { };
chapterskip = callPackage ./chapterskip.nix { };
convert = callPackage ./convert.nix { };
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
mpris = callPackage ./mpris.nix { };

4
pkgs/applications/virtualization/ecs-agent/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
version = "1.76.0";
version = "1.78.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
hash = "sha256-Ex+vYbOdD/AyCMgYF0xBKSxEM3lhBSRR80bx35t6tSA=";
hash = "sha256-/FppBl25AgwZhNcwWmUc0ThaTm1U4lhaoCTTJ/R/srI=";
};
vendorHash = null;

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View file

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "open-vm-tools";
version = "12.3.0";
version = "12.3.5";
src = fetchFromGitHub {
owner = "vmware";
repo = "open-vm-tools";
rev = "stable-${finalAttrs.version}";
hash = "sha256-YVpWomLED5sBKXKdJtuDjb7/aKB2flVIm2ED3xSsccE=";
hash = "sha256-OuESPenXVDKLckIZ3sQCtQXZXCL6xSLZOxZWVEX2XMk=";
};
sourceRoot = "${finalAttrs.src.name}/open-vm-tools";

9
pkgs/applications/window-managers/cardboard/default.nix → pkgs/by-name/ca/cardboard/package.nix
View file

@ -71,6 +71,8 @@ stdenv.mkDerivation {
src = allSources.cardboard;
outputs = [ "out" "dev" "lib" "man" ];
nativeBuildInputs = [
meson
ninja
@ -117,13 +119,18 @@ stdenv.mkDerivation {
(lib.mesonEnable "wlroots:libseat" false)
];
# gcc12
# gcc12
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ];
passthru = {
providedSessions = [ "cardboard" ];
};
meta = {
homepage = "https://gitlab.com/cardboardwm/cardboard";
description = "A scrollable, tiling Wayland compositor inspired on PaperWM";
license = lib.licenses.gpl3Only;
mainProgram = "cardboard";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms;
};

40
pkgs/by-name/py/pyprland/package.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "pyprland";
version = "1.4.1";
format = "pyproject";
disabled = python3Packages.pythonOlder "3.10";
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "pyprland";
rev = version;
hash = "sha256-x/Rar80jwBX64pW+uv0edhlC44OP1b1e2vnJLFGlIms=";
};
nativeBuildInputs = with python3Packages; [ poetry-core ];
postInstall = ''
# file has shebang but cant be run due to a relative import, has proper entrypoint in /bin
chmod -x $out/${python3Packages.python.sitePackages}/pyprland/command.py
'';
pythonImportsCheck = [
"pyprland"
"pyprland.common"
"pyprland.plugins"
"pyprland.plugins.interface"
"pyprland.plugins.ironbar"
];
meta = with lib; {
mainProgram = "pypr";
description = "An hyperland plugin system";
homepage = "https://github.com/hyprland-community/pyprland";
license = licenses.mit;
maintainers = with maintainers; [ iliayar ];
platforms = platforms.linux;
};
}

8
pkgs/data/fonts/google-fonts/default.nix
View file

@ -6,7 +6,7 @@
stdenvNoCC.mkDerivation {
pname = "google-fonts";
version = "unstable-2022-11-14";
version = "unstable-2023-10-20";
# Adobe Blank is split out in a separate output,
# because it causes crashes with `libfontconfig`.
@ -16,8 +16,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "83e116a566eda04a2469a11ee562cef1d7b33e4f";
sha256 = "sha256-sSabk+VWkoXj1Nzv9ufgIU/nkfKf4XkZU1SO+j+eSPA=";
rev = "990be3ed8f77e31c26bf07b148d6a74b8e6241cf";
sha256 = "sha256-ffLXzaniHkWxGQpvlJpiO6/SAdbI3FONgTaq8Xu+WY0=";
};
postPatch = ''
@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation {
rm -rv ofl/cabincondensed \
ofl/signikanegative \
ofl/signikanegativesc \
ofl/*_todelist \
axisregistry/tests/data
if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
@ -67,5 +68,6 @@ stdenvNoCC.mkDerivation {
platforms = platforms.all;
hydraPlatforms = [];
maintainers = with maintainers; [ manveru ];
sourceProvenance = [ sourceTypes.binaryBytecode ];
};
}

2
pkgs/data/fonts/noto-fonts/default.nix
View file

@ -253,9 +253,11 @@ rec {
metadata.files;
installPhase = ''
runHook preInstall
for src in $srcs; do
install -D $src $out/share/fonts/noto/$(stripHash $src)
done
runHook postInstall
'';
meta = with lib; {

10
pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json
View file

@ -1,7 +1,7 @@
{
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-9ndQqJJzsCkR6KcYRNVW3wXWMxcH+0QzFgQQdCG8vSo=",
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-AXGLdWebddyJhTKMW/D/6tW8ODcaXrUM96m2hN9wYlg=",
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-wzF9kKNMeQTYZ2QUT5pIgauhl2qMpZ2nMLNTeAJuqtQ=",
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-NIelE8X+lKtH6yT3eFPZV7zYUR3Y5GnNobAbf7AckR0=",
"http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-zkJuJ8YlTrUV+28wHIqny3yQvjvZqEPG4WXYmaLcY8A="
"http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-B8XBpYycOYBjrhjlnyiz42YukIoOjGTd3NN3EY00NiQ=",
"http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-Zfwh9q2GrL5Dwp+J/8Ddd2IXCaUXpQ7dE3CqgCMMyPs=",
"http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-/O5b2DzM8g97NAdJgIC/RsQ7E5P7USKq7TXyDuUE3WQ=",
"http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-vrjB8GlhzWAe6jG/Srpy8R431VivNtWbCa5Uh4ATnmU=",
"http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-EbnZt8h4Lcl0yJoOKmXlF1nfcP5hZv7n4cEQ10yBkcg="
}

16
pkgs/data/fonts/noto-fonts/noto-emoji.json
View file

@ -13,18 +13,18 @@
"subsets": [
"emoji"
],
"version": "v46",
"lastModified": "2023-09-07",
"version": "v47",
"lastModified": "2023-09-27",
"files": {
"300": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf",
"regular": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf",
"500": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf",
"600": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf",
"700": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf"
"300": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf",
"regular": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf",
"500": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf",
"600": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf",
"700": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf"
},
"category": "sans-serif",
"kind": "webfonts#webfont",
"menu": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf"
"menu": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf"
}
]
}

8
pkgs/desktops/plasma-5/srcs.nix
View file

@ -404,11 +404,11 @@
};
};
plasma-workspace = {
version = "5.27.9";
version = "5.27.9.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.tar.xz";
sha256 = "0b2xw5izw5pjlyw2mppmxplibdm4vm2kj18rz1narksg7rwnwfmw";
name = "plasma-workspace-5.27.9.tar.xz";
url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz";
sha256 = "8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8";
name = "plasma-workspace-5.27.9.1.tar.xz";
};
};
plasma-workspace-wallpapers = {

11
pkgs/development/interpreters/jruby/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, fetchurl, mkRubyVersion, makeBinaryWrapper, jre }:
{ lib, stdenv, callPackage, fetchurl, gitUpdater, mkRubyVersion, makeBinaryWrapper, jre }:
let
# The version number here is whatever is reported by the RUBY_VERSION string
@ -6,11 +6,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "jruby";
version = "9.4.3.0";
version = "9.4.4.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk=";
hash = "sha256-arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
@ -52,12 +52,15 @@ stdenv.mkDerivation (finalAttrs: {
devEnv = callPackage ../ruby/dev.nix {
ruby = finalAttrs.finalPackage;
};
updateScript = gitUpdater {
url = "https://github.com/jruby/jruby.git";
};
};
meta = with lib; {
description = "Ruby interpreter written in Java";
homepage = "https://www.jruby.org/";
changelog = "https://github.com/jruby/jruby/releases/tag/${version}";
changelog = "https://github.com/jruby/jruby/releases/tag/${finalAttrs.version}";
license = with licenses; [ cpl10 gpl2 lgpl21 ];
platforms = jre.meta.platforms;
maintainers = [ maintainers.fzakaria ];

6
pkgs/development/java-modules/postgresql_jdbc/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "postgresql-jdbc";
version = "42.5.1";
version = "42.6.0";
src = fetchMavenArtifact {
artifactId = "postgresql";
groupId = "org.postgresql";
sha256 = "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4=";
hash = "sha256-uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE=";
inherit version;
};
@ -19,8 +19,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://jdbc.postgresql.org/";
changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}";
description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
license = licenses.bsd2;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/simdjson/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
sha256 = "sha256-81CvuQduIV1R/FN7nbVIQQs79B/Cy1ylOldNXix1KMw=";
sha256 = "sha256-d1tJJCHbx+7klS918Db7S2N8zCdvd9MhI5ybxJpncUw=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/development/php-packages/box/default.nix
View file

@ -2,23 +2,23 @@
php.buildComposerProject (finalAttrs: {
pname = "box";
version = "4.3.8";
version = "4.5.0";
src = fetchFromGitHub {
owner = "box-project";
repo = "box";
rev = finalAttrs.version;
hash = "sha256-v1J84nqaX36DrLLH5kld+8NIymqtt5/5nJWJNCBVFRE=";
hash = "sha256-6icHXRxqre2RBIRoc3zfQnxGRHh2kIen2oLJ3eQjD/0=";
};
vendorHash = "sha256-LWggAUBMKljxa7HNdJMqOD/sx3IWCOQSqbYEnGntjN0=";
vendorHash = "sha256-n/F/il1u+3amSVf8fr0scZSkXuwxW43iq5F2XQJ3xfM=";
meta = {
changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}";
description = "An application for building and managing Phars";
license = lib.licenses.mit;
homepage = "https://github.com/box-project/box";
maintainers = lib.teams.php.members;
license = lib.licenses.mit;
mainProgram = "box";
maintainers = lib.teams.php.members;
};
})

4
pkgs/development/python-modules/argcomplete/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "argcomplete";
version = "3.1.1";
version = "3.1.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "kislyuk";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-N1Us/dpF/y638qIuwTzBiuv4vXfBMtWxmQnMBxNTUuc=";
hash = "sha256-vKXHmCcZZTjVBwQZWtyRjJT4tTuIiK5Qos9yJT/mpag=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

2
pkgs/development/python-modules/dvc/default.nix
View file

@ -62,7 +62,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-tEdYa3YkCE8qg6/XOxNm7kKULGk+KXxMkMNtW6T7+yw=";
hash = "sha256-yaZCx9NPdr2136Z8ig+5Db8+wUbZpSgzMSyILOQZCR8=";
};
pythonRelaxDeps = [

2
pkgs/development/rocm-modules/5/default.nix
View file

@ -105,8 +105,8 @@ in rec {
# Needs GCC
rocprofiler = callPackage ./rocprofiler {
inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin;
inherit (llvm) clang;
inherit rocmUpdateScript clr rocm-thunk roctracer rocm-smi hsa-amd-aqlprofile-bin;
};
# Needs GCC

15
pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8473a42..07ea873 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -112,10 +112,6 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE)
DEPENDS ${INPUT_FILE} clang
COMMENT "Building ${OUTPUT_FILE}..."
VERBATIM)
- install(
- FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1
- COMPONENT tests)
set(HSACO_TARGET_LIST
${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
PARENT_SCOPE)

111
pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch Normal file
View file

@ -0,0 +1,111 @@
diff --git a/bin/rocprofv2 b/bin/rocprofv2
index 92f7489..8839d4d 100755
--- a/bin/rocprofv2
+++ b/bin/rocprofv2
@@ -2,7 +2,8 @@
set -eo pipefail
CURRENT_DIR="$(dirname -- "$0")"
ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]}))
-ROCM_DIR=$(dirname -- "$ROCPROFV2_DIR")
+ROCPROFILER_DIR=$(dirname -- "$ROCPROFV2_DIR")
+ROCM_DIR=@rocmtoolkit_merged@
PLUGIN_LIST=("ctf" "perfetto" "file" "att")
RUN_FROM_BUILD=0
if [[ $ROCPROFV2_DIR == *"/build"* ]]; then
@@ -10,7 +11,7 @@ if [[ $ROCPROFV2_DIR == *"/build"* ]]; then
ROCM_DIR=$ROCPROFV2_DIR
fi
-export ROCPROFILER_METRICS_PATH=$ROCM_DIR/libexec/rocprofiler/counters/derived_counters.xml
+export ROCPROFILER_METRICS_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/counters/derived_counters.xml
export LD_LIBRARY_PATH=$ROCM_DIR/lib:$LD_LIBRARY_PATH
usage() {
@@ -70,8 +71,8 @@ while [ 1 ]; do
exit 1
fi
elif [[ "$1" = "--list-counters" ]]; then
- export LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so
- eval $ROCM_DIR/libexec/rocprofiler/ctrl
+ export LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so
+ eval $ROCPROFILER_DIR/libexec/rocprofiler/ctrl
exit 1
elif [[ "$1" = "-i" || "$1" = "--input" ]]; then
if [ $2 ] && [ -n $2 ] && [ -r $2 ]; then
@@ -171,7 +172,7 @@ while [ 1 ]; do
if [ $RUN_FROM_BUILD == 1 ]; then
ATT_PATH=$ROCM_DIR/plugin/att/att/att.py
else
- ATT_PATH=$ROCM_DIR/libexec/rocprofiler/att/att.py
+ ATT_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/att/att.py
export ROCPROFV2_ATT_LIB_PATH=$ROCM_DIR/lib/hsa-amd-aqlprofile/librocprofv2_att.so
fi
ATT_ARGV=$3
@@ -236,13 +237,13 @@ if [ -n "$PMC_LINES" ] && [ ! -n "$ATT_ARGV" ]; then
export OUTPUT_PATH=$FINAL_PATH
fi
let COUNTER=COUNTER+1
- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $*
+ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $*
if [ -n "$OUTPUT_PATH" ]; then
echo -e "\nThe output path for the following counters: $OUTPUT_PATH"
fi
done
else
- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $*
+ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $*
fi
get_pmc_results_txt_path() {
diff --git a/bin/rpl_run.sh b/bin/rpl_run.sh
index c1a3daa..bc868a5 100755
--- a/bin/rpl_run.sh
+++ b/bin/rpl_run.sh
@@ -24,16 +24,17 @@
time_stamp=`date +%y%m%d_%H%M%S`
BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))
-ROOT_DIR=$(dirname $BIN_DIR)
+ROCPROFILER_DIR=$(dirname $BIN_DIR)
+ROOT_DIR=@rocmtoolkit_merged@
RUN_DIR=`pwd`
TMP_DIR="/tmp"
DATA_DIR="rpl_data_${time_stamp}_$$"
-RPL_PATH=$ROOT_DIR/lib
+RPL_PATH=$ROCPROFILER_DIR/lib
TLIB_PATH=$RPL_PATH/rocprofiler
TTLIB_PATH=$ROOT_DIR/lib/roctracer
ROCM_LIB_PATH=$ROOT_DIR/lib
-PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler
+PROF_BIN_DIR=$ROCPROFILER_DIR/libexec/rocprofiler
if [ -z "$ROCP_PYTHON_VERSION" ] ; then
ROCP_PYTHON_VERSION=python3
@@ -73,7 +74,7 @@ export ROCP_METRICS=$TLIB_PATH/metrics.xml
# Disable AQL-profile read API
export AQLPROFILE_READ_API=0
# ROC Profiler package path
-export ROCP_PACKAGE_DIR=$ROOT_DIR
+export ROCP_PACKAGE_DIR=$ROCPROFILER_DIR
# enabled SPM KFD mode
export ROCP_SPM_KFD_MODE=1
@@ -350,7 +351,7 @@ convert_time_val() {
################################################################################################
# main
-echo "RPL: on '$time_stamp' from '$ROOT_DIR' in '$RUN_DIR'"
+echo "RPL: on '$time_stamp' from '$ROCPROFILER_DIR' in '$RUN_DIR'"
# Parsing arguments
if [ -z "$1" ] ; then
usage
@@ -557,7 +558,7 @@ elif [ "$input_type" = "txt" -o "$input_type" = "none" ] ; then
else
echo "<metric></metric>" > $RES_DIR/input.xml
fi
- input_list=`/bin/ls $RES_DIR/input*.xml`
+ input_list=`ls $RES_DIR/input*.xml`
export ROCPROFILER_SESS=$RES_DIR
else
fatal "Bad input file type '$INPUT_FILE'"

80
pkgs/development/rocm-modules/5/rocprofiler/default.nix
View file

@ -2,11 +2,16 @@
, stdenv
, fetchFromGitHub
, rocmUpdateScript
, symlinkJoin
, substituteAll
, cmake
, clang
, clr
, rocm-core
, rocm-thunk
, rocm-device-libs
, roctracer
, rocdbgapi
, rocm-smi
, hsa-amd-aqlprofile-bin
, numactl
@ -14,24 +19,32 @@
, libxml2
, elfutils
, mpi
, systemd
, gtest
, python3Packages
, gpuTargets ? [
"gfx900"
"gfx906"
"gfx908"
"gfx90a"
"gfx940"
"gfx941"
"gfx942"
"gfx1030"
"gfx1100"
"gfx1101"
"gfx1102"
]
, gpuTargets ? clr.gpuTargets
}:
stdenv.mkDerivation (finalAttrs: {
let
rocmtoolkit-merged = symlinkJoin {
name = "rocmtoolkit-merged";
paths = [
rocm-core
rocm-thunk
rocm-device-libs
roctracer
rocdbgapi
rocm-smi
hsa-amd-aqlprofile-bin
clr
];
postBuild = ''
rm -rf $out/nix-support
'';
};
in stdenv.mkDerivation (finalAttrs: {
pname = "rocprofiler";
version = "5.7.1";
@ -42,6 +55,17 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y=";
};
patches = [
# These just simply won't build
./0000-dont-install-tests-hsaco.patch
# Fix bad paths
(substituteAll {
src = ./0001-fix-shell-scripts.patch;
rocmtoolkit_merged = rocmtoolkit-merged;
})
];
nativeBuildInputs = [
cmake
clang
@ -53,20 +77,19 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
rocm-thunk
rocm-smi
hsa-amd-aqlprofile-bin
numactl
libpciaccess
libxml2
elfutils
mpi
systemd
gtest
];
propagatedBuildInputs = [ rocmtoolkit-merged ];
cmakeFlags = [
"-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip"
"-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext"
"-DHIP_ROOT_DIR=${clr}"
"-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
# Manually define CMAKE_INSTALL_<DIR>
@ -79,16 +102,21 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs .
# Cannot find ROCm device library, pointless
substituteInPlace CMakeLists.txt \
--replace "add_subdirectory(tests-v2)" "" \
--replace "add_subdirectory(samples)" ""
substituteInPlace tests-v2/featuretests/profiler/CMakeLists.txt \
--replace "--build-id=sha1" "--build-id=sha1 --rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode"
substituteInPlace test/CMakeLists.txt \
--replace "\''${ROCM_ROOT_DIR}/amdgcn/bitcode" "${rocm-device-libs}/amdgcn/bitcode"
'';
postBuild = ''
# HSACO aren't being built for some reason
substituteInPlace test/cmake_install.cmake \
--replace "file(INSTALL DESTINATION \"\''${CMAKE_INSTALL_PREFIX}/share/rocprofiler/tests-v1\" TYPE FILE FILES \"" "message(\""
postInstall = ''
# Why do these not already have the executable bit set?
chmod +x $out/lib/rocprofiler/librocprof-tool.so
chmod +x $out/share/rocprofiler/tests-v1/test/ocl/SimpleConvolution
# Why do these have the executable bit set?
chmod -x $out/libexec/rocprofiler/counters/basic_counters.xml
chmod -x $out/libexec/rocprofiler/counters/derived_counters.xml
'';
passthru.updateScript = rocmUpdateScript {

2
pkgs/development/tools/devbox/default.nix
View file

@ -38,6 +38,6 @@ buildGoModule rec {
description = "Instant, easy, predictable shells and containers.";
homepage = "https://www.jetpack.io/devbox";
license = licenses.asl20;
maintainers = with maintainers; [ urandom ];
maintainers = with maintainers; [ urandom lagoja ];
};
}

10
pkgs/development/tools/glade/default.nix
View file

@ -9,6 +9,7 @@
, gtk3
, glib
, gjs
, enableWebkit2gtk ? stdenv.isLinux
, webkitgtk_4_1
, gobject-introspection
, wrapGAppsHook
@ -49,13 +50,18 @@ stdenv.mkDerivation rec {
gtk3
glib
gjs
webkitgtk_4_1
libxml2
python3
python3.pkgs.pygobject3
gsettings-desktop-schemas
gdk-pixbuf
gnome.adwaita-icon-theme
] ++ lib.optionals enableWebkit2gtk [
webkitgtk_4_1
];
mesonFlags = [
(lib.mesonEnable "webkit2gtk" enableWebkit2gtk)
];
postPatch = ''
@ -74,6 +80,6 @@ stdenv.mkDerivation rec {
description = "User interface designer for GTK applications";
maintainers = teams.gnome.members;
license = licenses.lgpl2;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/tools/wabt/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wabt";
version = "1.0.33";
version = "1.0.34";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
sha256 = "sha256-zSgV+lrNpQcR+V6Icyf3cPMeAdRDfsL2EErF8pxev5c=";
sha256 = "sha256-KlaMc3k1y6KviMDrMbKPcJOywJasrPZrnvSos8hgu+8=";
fetchSubmodules = true;
};

5
pkgs/servers/fastnetmon-advanced/default.nix
View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "fastnetmon-advanced";
version = "2.0.351";
version = "2.0.352";
src = fetchurl {
url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
hash = "sha256-gLR4Z5VZyyt6CmoWcqDT75o50KyEJsfsx67Sqpiwh04=";
hash = "sha256-XYb1W3NYT8C9Jfs66NnqD2gRdYZFR5jzFLAIzx8a2Ck=";
};
nativeBuildInputs = [
@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high performance DDoS detector / sensor - commercial edition";
homepage = "https://fastnetmon.com";
changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = teams.wdz.members;
license = licenses.unfree;

14
pkgs/servers/sql/mysql/jdbc/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, ant, unzip }:
{ lib, stdenv, fetchurl, ant, unzip, gitUpdater }:
stdenv.mkDerivation rec {
pname = "mysql-connector-java";
version = "8.1.0";
version = "8.2.0";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip";
sha256 = "sha256-xFYvNbb5cj6xrMHAnTzGLC8v5fxqRcmZhf4haK3wtUk=";
hash = "sha256-N0emBuTaYlyL1SS0wDOR8uiz4yGUOMllKR7LC60eFEg=";
};
installPhase = ''
@ -18,11 +18,17 @@ stdenv.mkDerivation rec {
buildInputs = [ ant ];
passthru.updateScript = gitUpdater {
url = "https://github.com/mysql/mysql-connector-j.git";
};
meta = with lib; {
description = "MySQL Connector/J";
homepage = "https://dev.mysql.com/doc/connector-j/8.1/en/";
homepage = "https://dev.mysql.com/doc/connector-j/en/";
changelog = "https://dev.mysql.com/doc/relnotes/connector-j/en/";
maintainers = with maintainers; [ ];
platforms = platforms.unix;
license = licenses.gpl2;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

10
pkgs/shells/powershell/default.nix
View file

@ -29,7 +29,7 @@ let
in
stdenv.mkDerivation rec {
pname = "powershell";
version = "7.3.8";
version = "7.3.9";
src = passthru.sources.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -88,19 +88,19 @@ stdenv.mkDerivation rec {
sources = {
aarch64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
hash = "sha256-0FyTt+tn3mpr6LxC3oQvmULNO8+Jp7qsjISRdTesCCI=";
hash = "sha256-g63hMkJUIYFpSl9NylCQs0WYdq/8S3UaFVtRjhZOs+s=";
};
aarch64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
hash = "sha256-BNf157sdXg7pV6Hfg9luw3Xi03fTekesBQCwDFeO8ZI=";
hash = "sha256-zy6VZyXj9TV5QlVFnCgiB6XfIOyS79kPOFhvMRpOrP4=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
hash = "sha256-Ts+nF6tPQZfYgJAvPtijvYBGSrg5mxCeNEa0X74/g4M=";
hash = "sha256-DI+m3Ik1Zw293H6VR19DNAECBApqdIENlrK2/D/3vNc=";
};
x86_64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
hash = "sha256-iELDoFTy/W6Wm0gNJmywwvp811WycjffBTMDRtrWdVU=";
hash = "sha256-eHlh46eV+g3eCiKalVGixwKY9mlk2lXRwUJF6By5lP0=";
};
};
tests.version = testers.testVersion {

24
pkgs/tools/graphics/argyllcms/default.nix
View file

@ -1,16 +1,18 @@
{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
, libXdmcp, libXau, lib, openssl }:
, libXdmcp, libXau, lib, openssl
, writeScript
}:
stdenv.mkDerivation rec {
pname = "argyllcms";
version = "3.0.0";
version = "3.0.2";
src = fetchzip {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
# while on me. It might be good to find a mirror
url = "https://www.argyllcms.com/Argyll_V${version}_src.zip";
sha256 = "sha256-nX7YwsbWqaHav22S91ZkfAXXxuFYANhAv5hTO696Dt0=";
hash = "sha256-9+rUhZVwSzAM9Ko6FYyl2OVvsOFBaUCA1PJs9kaLWaE=";
};
nativeBuildInputs = [ jam unzip ];
@ -120,8 +122,22 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = writeScript "update-argyllcms" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl pcre common-updater-scripts
set -eu -o pipefail
# Expect the text in format of 'Current Version 3.0.1 (19th October 2023)'
new_version="$(curl -s https://www.argyllcms.com/ |
pcregrep -o1 '>Current Version ([0-9.]+) ')"
update-source-version ${pname} "$new_version"
'';
};
meta = with lib; {
homepage = "http://www.argyllcms.com";
homepage = "https://www.argyllcms.com/";
description = "Color management system (compatible with ICC)";
license = licenses.gpl3;
maintainers = [];

1
pkgs/tools/security/sops/default.nix
View file

@ -21,6 +21,7 @@ buildGoModule rec {
homepage = "https://github.com/getsops/sops";
description = "Simple and flexible tool for managing secrets";
changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst";
mainProgram = "sops";
maintainers = [ maintainers.marsam ];
license = licenses.mpl20;
};

8
pkgs/top-level/all-packages.nix
View file

@ -1710,6 +1710,7 @@ with pkgs;
butler = callPackage ../games/itch/butler.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
buildGoModule = buildGo120Module;
};
carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { };
@ -4680,7 +4681,10 @@ with pkgs;
cloudbrute = callPackage ../tools/security/cloudbrute { };
cloudflared = callPackage ../applications/networking/cloudflared { };
cloudflared = callPackage ../applications/networking/cloudflared {
# https://github.com/cloudflare/cloudflared/issues/1054
buildGoModule = buildGo120Module;
};
cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };
@ -30760,8 +30764,6 @@ with pkgs;
caerbannog = callPackage ../applications/misc/caerbannog { };
cardboard = callPackage ../applications/window-managers/cardboard { };
cardo = callPackage ../data/fonts/cardo { };
cage = callPackage ../applications/window-managers/cage {