alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-11-29 00:02:37 +00:00 committed by GitHub
parent c9cba1ab24 9102f78309
commit e6be0713d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 1572 additions and 1355 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
View file

@ -83,7 +83,10 @@
<itemizedlist spacing="compact">
<listitem>
<para>
Create the first release note entry in this section!
The module for the application firewall
<literal>opensnitch</literal> got the ability to configure
rules. Available as
<link linkend="opt-services.opensnitch.rules">services.opensnitch.rules</link>
</para>
</listitem>
</itemizedlist>

2
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -33,4 +33,4 @@ In addition to numerous new and upgraded packages, this release has the followin
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Create the first release note entry in this section!
- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules)

28
nixos/modules/services/misc/gitlab.nix
View file

@ -16,22 +16,6 @@ let
else
pkgs.postgresql_12;
# Git 2.36.1 seemingly contains a commit-graph related bug which is
# easily triggered through GitLab, so we downgrade it to 2.35.x
# until this issue is solved. See
# https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101.
gitPackage =
let
version = "2.35.4";
in
pkgs.git.overrideAttrs (oldAttrs: rec {
inherit version;
src = pkgs.fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "sha256-mv13OdNkXggeKQkJ+47QcJ6lYmcw6Qjri1ZJ2ETCTOk=";
};
});
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
@ -60,7 +44,7 @@ let
prometheus_listen_addr = "localhost:9236"
[git]
bin_path = "${gitPackage}/bin/git"
bin_path = "${pkgs.git}/bin/git"
[gitaly-ruby]
dir = "${cfg.packages.gitaly.ruby}"
@ -157,7 +141,7 @@ let
};
workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret";
git.bin_path = "${gitPackage}/bin/git";
git.bin_path = "git";
monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
sidekiq_exporter = {
@ -1325,7 +1309,7 @@ in {
});
path = with pkgs; [
postgresqlPackage
gitPackage
git
ruby
openssh
nodejs
@ -1356,7 +1340,7 @@ in {
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
gitPackage
git
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby
gzip
@ -1402,7 +1386,7 @@ in {
path = with pkgs; [
remarshal
exiftool
gitPackage
git
gnutar
gzip
openssh
@ -1475,7 +1459,7 @@ in {
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
gitPackage
git
openssh
nodejs
procps

8
nixos/modules/services/monitoring/prometheus/exporters/pve.nix
View file

@ -10,7 +10,7 @@ let
text = "default:";
};
computedConfigFile = "${if cfg.configFile == null then emptyConfigFile else cfg.configFile}";
computedConfigFile = if cfg.configFile == null then emptyConfigFile else cfg.configFile;
in
{
port = 9221;
@ -100,6 +100,8 @@ in
};
serviceOpts = {
serviceConfig = {
DynamicUser = cfg.environmentFile == null;
LoadCredential = "configFile:${computedConfigFile}";
ExecStart = ''
${cfg.package}/bin/pve_exporter \
--${if cfg.collectors.status == true then "" else "no-"}collector.status \
@ -108,11 +110,11 @@ in
--${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \
--${if cfg.collectors.resources == true then "" else "no-"}collector.resources \
--${if cfg.collectors.config == true then "" else "no-"}collector.config \
${computedConfigFile} \
%d/configFile \
${toString cfg.port} ${cfg.listenAddress}
'';
} // optionalAttrs (cfg.environmentFile != null) {
EnvironmentFile = cfg.environmentFile;
EnvironmentFile = cfg.environmentFile;
};
};
}

83
nixos/modules/services/security/opensnitch.nix
View file

@ -5,10 +5,47 @@ with lib;
let
cfg = config.services.opensnitch;
format = pkgs.formats.json {};
predefinedRules = flip mapAttrs cfg.rules (name: cfg: {
file = pkgs.writeText "rule" (builtins.toJSON cfg);
});
in {
options = {
services.opensnitch = {
enable = mkEnableOption (lib.mdDoc "Opensnitch application firewall");
enable = mkEnableOption (mdDoc "Opensnitch application firewall");
rules = mkOption {
default = {};
example = literalExpression ''
{
"tor" = {
"name" = "tor";
"enabled" = true;
"action" = "allow";
"duration" = "always";
"operator" = {
"type" ="simple";
"sensitive" = false;
"operand" = "process.path";
"data" = "''${lib.getBin pkgs.tor}/bin/tor";
};
};
};
'';
description = mdDoc ''
Declarative configuration of firewall rules.
All rules will be stored in `/var/lib/opensnitch/rules`.
See [upstream documentation](https://github.com/evilsocket/opensnitch/wiki/Rules)
for available options.
'';
type = types.submodule {
freeformType = format.type;
};
};
settings = mkOption {
type = types.submodule {
freeformType = format.type;
@ -18,7 +55,7 @@ in {
Address = mkOption {
type = types.str;
description = lib.mdDoc ''
description = mdDoc ''
Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is
mandatory) or TCP socket (192.168.1.100:50051).
'';
@ -26,7 +63,7 @@ in {
LogFile = mkOption {
type = types.path;
description = lib.mdDoc ''
description = mdDoc ''
File to write logs to (use /dev/stdout to write logs to standard
output).
'';
@ -36,7 +73,7 @@ in {
DefaultAction = mkOption {
type = types.enum [ "allow" "deny" ];
description = lib.mdDoc ''
description = mdDoc ''
Default action whether to block or allow application internet
access.
'';
@ -46,28 +83,28 @@ in {
type = types.enum [
"once" "always" "until restart" "30s" "5m" "15m" "30m" "1h"
];
description = lib.mdDoc ''
description = mdDoc ''
Default duration of firewall rule.
'';
};
InterceptUnknown = mkOption {
type = types.bool;
description = lib.mdDoc ''
description = mdDoc ''
Wheter to intercept spare connections.
'';
};
ProcMonitorMethod = mkOption {
type = types.enum [ "ebpf" "proc" "ftrace" "audit" ];
description = lib.mdDoc ''
description = mdDoc ''
Which process monitoring method to use.
'';
};
LogLevel = mkOption {
type = types.enum [ 0 1 2 3 4 ];
description = lib.mdDoc ''
description = mdDoc ''
Default log level from 0 to 4 (debug, info, important, warning,
error).
'';
@ -75,7 +112,7 @@ in {
Firewall = mkOption {
type = types.enum [ "iptables" "nftables" ];
description = lib.mdDoc ''
description = mdDoc ''
Which firewall backend to use.
'';
};
@ -84,14 +121,14 @@ in {
MaxEvents = mkOption {
type = types.int;
description = lib.mdDoc ''
description = mdDoc ''
Max events to send to the GUI.
'';
};
MaxStats = mkOption {
type = types.int;
description = lib.mdDoc ''
description = mdDoc ''
Max stats per item to keep in backlog.
'';
};
@ -99,9 +136,8 @@ in {
};
};
};
description = lib.mdDoc ''
opensnitchd configuration. Refer to
<https://github.com/evilsocket/opensnitch/wiki/Configurations>
description = mdDoc ''
opensnitchd configuration. Refer to [upstream documentation](https://github.com/evilsocket/opensnitch/wiki/Configurations)
for details on supported values.
'';
};
@ -118,6 +154,25 @@ in {
services.opensnitchd.wantedBy = [ "multi-user.target" ];
};
systemd.services.opensnitchd.preStart = mkIf (cfg.rules != {}) (let
rules = flip mapAttrsToList predefinedRules (file: content: {
inherit (content) file;
local = "/var/lib/opensnitch/rules/${file}.json";
});
in ''
# Remove all firewall rules from `/var/lib/opensnitch/rules` that are symlinks to a store-path,
# but aren't declared in `cfg.rules` (i.e. all networks that were "removed" from
# `cfg.rules`).
find /var/lib/opensnitch/rules -type l -lname '${builtins.storeDir}/*' ${optionalString (rules != {}) ''
-not \( ${concatMapStringsSep " -o " ({ local, ... }:
"-name '${baseNameOf local}*'")
rules} \) \
''} -delete
${concatMapStrings ({ file, local }: ''
ln -sf '${file}' "${local}"
'') rules}
'');
environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings;
};

1
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View file

@ -60,6 +60,7 @@ self: let
else super.org-transclusion;
rcirc-menu = markBroken super.rcirc-menu; # Missing file header
cl-lib = null; # builtin
cl-print = null; # builtin
tle = null; # builtin
advice = null; # builtin
seq = if lib.versionAtLeast self.emacs.version "27"

40
pkgs/applications/editors/retext/default.nix
View file

@ -1,7 +1,11 @@
{ lib
, python3
, fetchzip
, fetchFromGitHub
, wrapQtAppsHook
, qtbase
, qttools
, qtsvg
, buildEnv
, aspellDicts
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
@ -11,18 +15,29 @@
python3.pkgs.buildPythonApplication rec {
pname = "retext";
version = "7.2.3";
version = "8.0.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "retext-project";
repo = "retext";
repo = pname;
rev = version;
hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA=";
hash = "sha256-22yqNwIehgTfeElqhN5Jzye7LbcAiseTeoMgenpmsL0=";
};
toolbarIcons = fetchzip {
url = "https://github.com/retext-project/retext/archive/icons.zip";
hash = "sha256-LQtSFCGWcKvXis9pFDmPqAMd1m6QieHQiz2yykeTdnI=";
};
nativeBuildInputs = [
wrapQtAppsHook
qttools.dev
];
buildInputs = [
qtbase
qtsvg
];
propagatedBuildInputs = with python3.pkgs; [
@ -32,14 +47,19 @@ python3.pkgs.buildPythonApplication rec {
markups
pyenchant
pygments
pyqt5
pyqt6
pyqt6-webengine
];
postPatch = ''
# Remove wheel check
sed -i -e '31,36d' setup.py
patches = [ ./remove-wheel-check.patch ];
preConfigure = ''
lrelease ReText/locale/*.ts
'';
# prevent double wrapping
dontWrapQtApps = true;
postInstall = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
makeWrapperArgs+=(
@ -49,9 +69,11 @@ python3.pkgs.buildPythonApplication rec {
}}"
)
cp ${toolbarIcons}/* $out/${python3.pkgs.python.sitePackages}/ReText/icons
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
--replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \
--replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg"
--replace "Icon=ReText/icons/retext.svg" "Icon=retext"
'';
doCheck = false;
@ -63,7 +85,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Editor for Markdown and reStructuredText";
homepage = "https://github.com/retext-project/retext/";
license = licenses.gpl2Plus;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ klntsky ];
platforms = platforms.unix;
};

28
pkgs/applications/editors/retext/remove-wheel-check.patch Normal file
View file

@ -0,0 +1,28 @@
From f07d08d3056c46f62674f65eabae0efa2b65d681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Oct 2022 16:53:27 +0200
Subject: [PATCH] disable wheel check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index a9cae37..e0e1e5b 100755
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@ def run(self):
desktop_file_path = join(self.install_data, 'share', 'applications',
'me.mitya57.ReText.desktop')
- if self.root and self.root.endswith('/wheel'):
+ if False and self.root and self.root.endswith('/wheel'):
# Desktop files don't allow relative paths, and we don't know the
# absolute path when building a wheel.
log.info('removing the .desktop file from the wheel')
--
2.37.3

12
pkgs/applications/emulators/desmume/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, SDL2
, agg
, alsa-lib
@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo=";
};
patches = [
# Fix compiling on GCC for AArch64
(fetchpatch {
url = "https://github.com/TASEmulators/desmume/commit/24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061.patch";
hash = "sha256-J3ZRU1tPTl+4/jg0DBo6ro6DTUZkpQCey+QGF2EugCQ=";
})
];
nativeBuildInputs = [
desktop-file-utils
intltool
@ -81,8 +90,5 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl2Plus;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;
broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed
};
})
# TODO: investigate the patches
# TODO: investigate other platforms

12
pkgs/applications/misc/blender/darwin.patch
View file

@ -1,7 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
@@ -1894,7 +1894,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)
if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
if(APPLE)
@ -58,10 +58,10 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
- theora theoradec theoraenc vorbis vorbisenc
- vorbisfile vpx x264 xvidcore)
+ swresample swscale)
find_package(FFmpeg)
endif()
@@ -270,7 +263,6 @@ if(WITH_BOOST)
if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
list(APPEND FFMPEG_FIND_COMPONENTS aom)
endif()
@@ -273,7 +266,6 @@ if(WITH_BOOST)
endif()
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
@ -69,7 +69,7 @@ diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake
endif()
if(WITH_PUGIXML)
@@ -399,7 +391,7 @@ endif()
@@ -402,7 +394,7 @@ endif()
# CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
if(WITH_OPENMP)

4
pkgs/applications/misc/pdfarranger/default.nix
View file

@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "pdfarranger";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-VMFkZsFx2pN0IrWTdc9OqkdQwuk6b4Ay4zsvN9HTHug=";
sha256 = "sha256-nZSP9JBbUPG9xk/ATXUYkjyP344m+e7RQS3BiFVzQf4=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/appgate-sdp/default.nix
View file

@ -86,11 +86,11 @@ let
in
stdenv.mkDerivation rec {
pname = "appgate-sdp";
version = "6.0.2";
version = "6.0.3";
src = fetchurl {
url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
sha256 = "sha256-ut5a/tpWEQX1Jug9IZksnxbQ/rs2pGNh8zBb2a43KUE=";
sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM=";
};
# just patch interpreter

1
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -303,6 +303,7 @@ let
# as well to avoid incompatibilities (if this continues to be a problem
# from time to time):
use_system_libwayland = true;
system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;

9
pkgs/applications/office/portfolio/default.nix
View file

@ -11,6 +11,7 @@
, makeDesktopItem
, webkitgtk
, wrapGAppsHook
, writeScript
}:
let
desktopItem = makeDesktopItem {
@ -60,12 +61,20 @@ stdenv.mkDerivation rec {
ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/buchen/portfolio/tags" | jq '.[0].name' --raw-output)"
update-source-version portfolio "$version"
'';
meta = with lib; {
description = "A simple tool to calculate the overall performance of an investment portfolio";
homepage = "https://www.portfolio-performance.info/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.epl10;
maintainers = with maintainers; [ elohmeier oyren shawn8901 ];
mainProgram = "portfolio";
platforms = [ "x86_64-linux" ];
};
}

1
pkgs/applications/science/math/giac/default.nix
View file

@ -133,6 +133,7 @@ stdenv.mkDerivation rec {
homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin);
broken = stdenv.isDarwin && stdenv.isAarch64;
maintainers = [ maintainers.symphorien ];
};
}

9
pkgs/applications/science/math/pari/default.nix
View file

@ -14,7 +14,7 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
pname = "pari";
version = "2.13.4";
version = "2.15.1";
src = fetchurl {
urls = [
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
# old versions are at the url below
"https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"
];
hash = "sha256-vN6ezq4VkoFDgcFpfNtwY1Z7ZQQgGxvke7WJIPO84YU=";
hash = "sha256-RUGdt3xmhb7mfkLg7LeOGe9WK+eq/GN8ikGXDy6Qnj0=";
};
buildInputs = [
@ -40,17 +40,12 @@ stdenv.mkDerivation rec {
"--with-gmp=${lib.getDev gmp}"
"--with-readline=${lib.getDev readline}"
]
++ lib.optional stdenv.isDarwin "--host=${stdenv.system}"
++ lib.optional withThread "--mt=pthread";
preConfigure = ''
export LD=$CC
'';
postConfigure = lib.optionalString stdenv.isDarwin ''
echo 'echo ${stdenv.system}' > config/arch-osname
'';
makeFlags = [ "all" ];
meta = with lib; {

26
pkgs/applications/science/math/sage/patches/pari-2.15.1-upgrade-rebased.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/src/sage/geometry/polyhedron/backend_normaliz.py b/src/sage/geometry/polyhedron/backend_normaliz.py
index 86b89632a5..ca8a43b248 100644
--- a/src/sage/geometry/polyhedron/backend_normaliz.py
+++ b/src/sage/geometry/polyhedron/backend_normaliz.py
@@ -53,7 +53,7 @@ def _number_field_elements_from_algebraics_list_of_lists_of_lists(listss, **kwds
1.732050807568878?
sage: from sage.geometry.polyhedron.backend_normaliz import _number_field_elements_from_algebraics_list_of_lists_of_lists
sage: K, results, hom = _number_field_elements_from_algebraics_list_of_lists_of_lists([[[rt2], [1]], [[rt3]], [[1], []]]); results # optional - sage.rings.number_field
- [[[-a^3 + 3*a], [1]], [[-a^2 + 2]], [[1], []]]
+ [[[-a^3 + 3*a], [1]], [[a^2 - 2]], [[1], []]]
"""
from sage.rings.qqbar import number_field_elements_from_algebraics
numbers = []
diff --git a/src/sage/lfunctions/pari.py b/src/sage/lfunctions/pari.py
index d2b20f1891..6c31efe239 100644
--- a/src/sage/lfunctions/pari.py
+++ b/src/sage/lfunctions/pari.py
@@ -339,7 +339,7 @@ def lfun_eta_quotient(scalings, exponents):
0.0374412812685155
sage: lfun_eta_quotient([6],[4])
- [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4])]], 0, [0, 1], 2, 36, 1]
+ [[Vecsmall([7]), [Vecsmall([6]), Vecsmall([4]), 0]], 0, [0, 1], 2, 36, 1]
sage: lfun_eta_quotient([2,1,4], [5,-2,-2])
Traceback (most recent call last):

16
pkgs/applications/science/math/sage/sage-src.nix
View file

@ -147,6 +147,22 @@ stdenv.mkDerivation rec {
sha256 = "sha256-9BhQLFB3wUhiXRQsK9L+I62lSjvTfrqMNi7QUIQvH4U=";
})
# https://trac.sagemath.org/ticket/34537
(fetchSageDiff {
name = "pari-2.15.1-upgrade.patch";
squashed = true;
base = "54cd6fe6de52aee5a433e0569e8c370618cb2047"; # 9.8.beta1
rev = "1e86aa26790d84bf066eca67f98a60a8aa3d4d3a";
sha256 = "sha256-LUgcMqrKXWb72Kxl0n6MV5unLXlQSeG8ncN41F7TRSc=";
excludes = ["build/*"
"src/sage/geometry/polyhedron/base_number_field.py"
"src/sage/geometry/polyhedron/backend_normaliz.py"
"src/sage/lfunctions/pari.py"];
})
# Some files were excluded from the above patch due to
# conflicts. The patch below contains rebased versions.
./patches/pari-2.15.1-upgrade-rebased.patch
# Sage uses mixed integer programs (MIPs) to find edge disjoint
# spanning trees. For some reason, aarch64 glpk takes much longer
# than x86_64 glpk to solve such MIPs. Since the MIP formulation

18
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,15 +1,15 @@
{
"version": "15.4.4",
"repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=",
"yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
"version": "15.6.0",
"repo_hash": "sha256-7Pjksu1l2QfhpYieEGB9coypSt/0iMfptCa69Iaoe3s=",
"yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.4.4-ee",
"rev": "v15.6.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.4.4",
"GITLAB_PAGES_VERSION": "1.62.0",
"GITLAB_SHELL_VERSION": "14.10.0",
"GITLAB_WORKHORSE_VERSION": "15.4.4"
"GITALY_SERVER_VERSION": "15.6.0",
"GITLAB_PAGES_VERSION": "1.63.0",
"GITLAB_SHELL_VERSION": "14.13.0",
"GITLAB_WORKHORSE_VERSION": "15.6.0"
},
"vendored_gems": [
"bundler-checksum",
@ -17,9 +17,9 @@
"omniauth-azure-oauth2",
"omniauth-cas3",
"omniauth-gitlab",
"omniauth-google-oauth2",
"omniauth_crowd",
"omniauth-salesforce",
"attr_encrypted",
"mail-smtp_pool",
"microsoft_graph_mailer",
"ipynbdiff",

5
pkgs/applications/version-management/gitlab/default.nix
View file

@ -108,7 +108,7 @@ let
bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production
@ -137,9 +137,6 @@ stdenv.mkDerivation {
patches = [
# Change hardcoded paths to the NixOS equivalent
./remove-hardcoded-locations.patch
# Bump pg to 1.4.3 (see https://github.com/NixOS/nixpkgs/pull/187946)
./update-pg.patch
];
postPatch = ''

19
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file

@ -4,22 +4,27 @@ gem 'rugged', '~> 1.2'
gem 'github-linguist', '~> 7.20.0', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.1.6.1'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
# Ruby sidecar.
gem 'gitaly', '~> 15.5.0'
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.24'
gem 'gitlab-labkit', '~> 0.28'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.15'
gem 'google-protobuf', '~> 3.21.0'
gem 'google-protobuf', '~> 3.21.9'
# Rails is currently blocked on the upgrade to the new major version for Redis,
# so we don't upgrade either until the issue is resolved. This is an indirect
# dependency and can thus be removed when the version constraint is gone.
gem 'redis', '~> 4.8.0'
group :development, :test do
gem 'rubocop', '~> 0.69', require: false
@ -28,8 +33,6 @@ group :development, :test do
gem 'timecop', require: false
gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false
gem 'grpc-tools', '~> 1.42.0'
end
# Gems required in omnibus-gitlab pipeline

52
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file

@ -46,33 +46,21 @@ GEM
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.15.5)
gemojione (3.3.0)
json
gitaly (15.5.0)
grpc (~> 1.0)
github-linguist (7.20.0)
charlock_holmes (~> 0.7.7)
escape_utils (~> 1.2.0)
mini_mime (~> 1.0)
rugged (~> 1.0)
github-markup (1.7.0)
gitlab-gollum-lib (4.2.7.10.gitlab.2)
gemojione (~> 3.2)
github-markup (~> 1.6)
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 3.1)
sanitize (~> 6.0)
stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
mime-types (>= 1.15)
rugged (~> 1.0)
gitlab-labkit (0.24.0)
gitlab-labkit (0.28.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
pg_query (~> 2.1)
redis (> 3.0.0, < 5.0.0)
redis (> 3.0.0, < 6.0.0)
gitlab-license_finder (6.14.2.1)
bundler
rubyzip (>= 1, < 3)
@ -81,35 +69,30 @@ GEM
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.7.1)
google-protobuf (3.21.5)
google-protobuf (3.21.9)
googleapis-common-protos-types (1.4.0)
google-protobuf (~> 3.14)
grpc (1.42.0)
google-protobuf (~> 3.18)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.42.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
json (2.5.1)
licensee (9.15.2)
dotenv (~> 2.0)
octokit (~> 4.20)
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
loofah (2.18.0)
loofah (2.19.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.1104)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.3)
@ -126,7 +109,7 @@ GEM
parallel (1.19.2)
parser (3.0.3.2)
ast (~> 2.4.1)
pg_query (2.1.3)
pg_query (2.2.0)
google-protobuf (>= 3.19.2)
proc_to_ast (0.1.0)
coderay
@ -151,13 +134,11 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.3.2)
redis (4.8.0)
regexp_parser (1.8.1)
reverse_markdown (1.4.0)
nokogiri
rexml (3.2.5)
rouge (3.30.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@ -191,18 +172,14 @@ GEM
ruby-progressbar (1.10.1)
rubyzip (2.3.2)
rugged (1.2.0)
sanitize (6.0.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sentry-raven (3.0.4)
faraday (>= 1.0)
stringex (2.8.5)
thor (1.1.0)
thread_safe (0.3.6)
thrift (0.16.0)
thrift (0.17.0)
timecop (0.9.1)
tomlrb (2.0.1)
tzinfo (2.0.5)
@ -227,20 +204,17 @@ PLATFORMS
DEPENDENCIES
activesupport (~> 6.1.6.1)
factory_bot
faraday (~> 1.0)
gitaly (~> 15.5.0)
github-linguist (~> 7.20.0)
gitlab-gollum-lib (~> 4.2.7.10.gitlab.2)
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
gitlab-labkit (~> 0.24)
gitlab-labkit (~> 0.28)
gitlab-license_finder
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.21.0)
google-protobuf (~> 3.21.9)
grpc (~> 1.42.0)
grpc-tools (~> 1.42.0)
licensee (~> 9.15)
pry (~> 0.12.2)
rbtrace
rdoc (~> 6.0)
redis (~> 4.8.0)
rspec
rspec-parameterized
rubocop (~> 0.69)
@ -249,4 +223,4 @@ DEPENDENCIES
timecop
BUNDLED WITH
2.3.15
2.3.24

12
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
, bundlerEnv, pkg-config
# libgit2 + dependencies
, libgit2_1_3_0, openssl, zlib, pcre, http-parser }:
, libgit2, openssl, zlib, pcre, http-parser }:
let
rubyEnv = bundlerEnv rec {
@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.4.4";
version = "15.6.0";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,17 +22,17 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU=";
sha256 = "sha256-MQFvDSQhmlCz+ox9TFFEd+q2beDUXYVhIyEWWnxn7r0=";
};
vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";
vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
doCheck = false;
};
@ -59,7 +59,7 @@ buildGoModule ({
postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto} $ruby
cp -rv $src/ruby/{bin,lib} $ruby
'';
outputs = [ "out" "ruby" ];

142
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View file

@ -215,14 +215,16 @@
};
version = "1.15.5";
};
gemojione = {
dependencies = ["json"];
gitaly = {
dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq";
type = "gem";
};
version = "3.3.0";
version = "15.5.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"];
@ -235,46 +237,16 @@
};
version = "7.20.0";
};
github-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
type = "gem";
};
version = "1.7.0";
};
gitlab-gollum-lib = {
dependencies = ["gemojione" "github-markup" "gitlab-gollum-rugged_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vs6frgnhhfnyicsjck39xibmn7xc6ji7wvznvfmr53f4smqjk40";
type = "gem";
};
version = "4.2.7.10.gitlab.2";
};
gitlab-gollum-rugged_adapter = {
dependencies = ["mime-types" "rugged"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg";
type = "gem";
};
version = "0.4.4.4.gitlab.1";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg";
sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7";
type = "gem";
};
version = "0.24.0";
version = "0.28.0";
};
gitlab-license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
@ -302,10 +274,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9";
sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras";
type = "gem";
};
version = "3.21.5";
version = "3.21.9";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -329,16 +301,6 @@
};
version = "1.42.0";
};
grpc-tools = {
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xipvw8zcm1c3pna6fgmy83x0yvffii8d7wafwcxmszxa647brw1";
type = "gem";
};
version = "1.42.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
@ -369,16 +331,6 @@
};
version = "1.1.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
version = "2.5.1";
};
licensee = {
dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
groups = ["default"];
@ -396,10 +348,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1";
sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh";
type = "gem";
};
version = "2.18.0";
version = "2.19.0";
};
memoizable = {
dependencies = ["thread_safe"];
@ -418,27 +370,6 @@
};
version = "0.9.2";
};
mime-types = {
dependencies = ["mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
type = "gem";
};
version = "3.3.1";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
type = "gem";
};
version = "3.2020.1104";
};
mini_mime = {
groups = ["default"];
platforms = [];
@ -558,10 +489,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk";
sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4";
type = "gem";
};
version = "2.1.3";
version = "2.2.0";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@ -671,16 +602,6 @@
};
version = "0.4.14";
};
rdoc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y";
type = "gem";
};
version = "6.3.2";
};
redis = {
groups = ["default"];
platforms = [];
@ -722,16 +643,6 @@
};
version = "3.2.5";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3";
type = "gem";
};
version = "3.30.0";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development" "test"];
@ -849,17 +760,6 @@
};
version = "1.2.0";
};
sanitize = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1";
type = "gem";
};
version = "6.0.0";
};
sawyer = {
dependencies = ["addressable" "faraday"];
groups = ["default"];
@ -882,16 +782,6 @@
};
version = "3.0.4";
};
stringex = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys";
type = "gem";
};
version = "2.8.5";
};
thor = {
groups = ["default"];
platforms = [];
@ -915,10 +805,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh";
sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80";
type = "gem";
};
version = "0.16.0";
version = "0.17.0";
};
timecop = {
source = {

6
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View file

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.10.0";
version = "14.13.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-7uy7F4wK/4xz0PK9ZadaMjy3c+xUK9+YKaaEm5iFqUs=";
sha256 = "sha256-KN1twfuamRsG5/jan4Frhd4LXOU9Bp5Htex+TsTc+Is=";
};
buildInputs = [ ruby ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-urS0FED636APQe5uNvhDvWsnZtHCW60VtRE1B7IzGZQ=";
vendorSha256 = "sha256-CAadjiZCopjGNxQTJbvs56THtAve92ewiFLjGTY2/9E=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.4.4";
version = "15.6.0";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-dN3DfkAJkqkmGyahsBDsPQBog52RGECV+SESSR6W3fg=";
vendorSha256 = "sha256-VqJqyRRFmDugq0VG7gPBxllikVNv5et93jJHleSTS7M=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

145
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file

@ -2,30 +2,48 @@
source 'https://rubygems.org'
if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental
$LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__))
require 'bundler-checksum'
Bundler::Checksum.patch!
end
gem 'bundler-checksum', '~> 0.1.0', path: 'bundler-checksum', require: false
# NOTE: When incrementing the major or minor version here, also increment activerecord_version
# in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
gem 'rails', '~> 6.1.6.1'
gem 'bootsnap', '~> 1.13.0', require: false
# Pin openssl to match the version bundled with our supported Rubies.
# See https://stdgems.org/openssl/#gem-version.
gem 'openssl', '2.2.1'
# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
# Since the latest version caused problems with GitLab, we pin this to an older
# version for now.
# See https://gitlab.com/gitlab-org/gitlab/-/issues/376417
gem 'ipaddr', '1.2.2'
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 2.71.0'
gem 'view_component', '~> 2.74.1'
# Default values for AR models
gem 'default_value_for', '~> 3.4.0'
# Supported DBs
gem 'pg', '~> 1.4.0'
gem 'pg', '~> 1.4.3'
gem 'rugged', '~> 1.2'
gem 'grape-path-helpers', '~> 1.7.1'
gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.10.0'
gem 'marginalia', '~> 1.11.1'
# Authorization
gem 'declarative_policy', '~> 1.1.0'
@ -38,18 +56,17 @@ gem 'doorkeeper', '~> 5.5.0.rc2'
gem 'doorkeeper-openid_connect', '~> 1.7.5'
gem 'rexml', '~> 3.2.5'
gem 'ruby-saml', '~> 1.13.0'
gem 'omniauth-rails_csrf_protection'
gem 'omniauth', '~> 2.1.0'
gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'omniauth-azure-oauth2' # See gem README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
gem 'omniauth-alicloud', '~> 1.0.1'
gem 'omniauth-alicloud', '~> 2.0.0'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '2.0.0'
gem 'omniauth-github', '2.0.1'
gem 'omniauth-gitlab', '~> 4.0.0', path: 'omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
gem 'omniauth-google-oauth2', '~> 1.0.1', path: 'omniauth-google-oauth2' # See gem README.md
gem 'omniauth-google-oauth2', '~> 1.1'
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 2.0.0'
gem 'omniauth-shibboleth', '~> 1.3.0'
@ -59,7 +76,7 @@ gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
gem 'omniauth-salesforce', '~> 1.0.5', path: 'omniauth-salesforce' # See gem README.md
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.21.2'
gem 'rack-oauth2', '~> 1.21.3'
gem 'jwt', '~> 2.1.0'
# Kerberos authentication. EE-only
@ -69,12 +86,12 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
gem 'invisible_captcha', '~> 1.1.0'
gem 'invisible_captcha', '~> 2.0.0'
# Two-factor authentication
gem 'devise-two-factor', '~> 4.0.2'
gem 'rqrcode-rails3', '~> 0.1.7'
gem 'attr_encrypted', '~> 3.1.0'
gem 'attr_encrypted', '~> 3.2.4', path: 'attr_encrypted'
gem 'u2f', '~> 0.2.1'
# GitLab Pages
@ -84,7 +101,7 @@ gem 'rubyzip', '~> 2.3.2', require: 'zip'
gem 'acme-client', '~> 2.0'
# Browser detection
gem 'browser', '~> 4.2'
gem 'browser', '~> 5.3.1'
# OS detection for usage ping
gem 'ohai', '~> 16.10'
@ -101,7 +118,9 @@ gem 'net-ldap', '~> 0.16.3'
# API
gem 'grape', '~> 1.5.2'
gem 'grape-entity', '~> 0.10.0'
gem 'rack-cors', '~> 1.1.0', require: 'rack/cors'
gem 'rack-cors', '~> 1.1.1', require: 'rack/cors'
gem 'grape-swagger', '~>1.5.0', group: [:development, :test]
gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test]
# GraphQL API
gem 'graphql', '~> 1.13.12'
@ -110,12 +129,10 @@ gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
gem 'hashie'
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
gem 'hashie', '~> 5.0.0'
# Pagination
gem 'kaminari', '~> 1.0'
gem 'kaminari', '~> 1.2.2'
# HAML
gem 'hamlit', '~> 2.15.0'
@ -125,16 +142,16 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1'
# for backups
gem 'fog-aws', '~> 3.14'
gem 'fog-aws', '~> 3.15'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
gem 'fog-google', '~> 1.15', require: 'fog/google'
gem 'fog-local', '~> 0.6'
gem 'fog-google', '~> 1.19', require: 'fog/google'
gem 'fog-local', '~> 0.8'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm'
gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm'
# for Google storage
gem 'google-api-client', '~> 0.33'
@ -149,18 +166,17 @@ gem 'seed-fu', '~> 2.3.7'
gem 'elasticsearch-model', '~> 7.2'
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '7.13.3'
gem 'aws-sdk-core', '~> 3.131.0'
gem 'aws-sdk-core', '~> 3.167.0'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1.114.0'
gem 'aws-sdk-s3', '~> 1.117.1'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.13.2'
gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.8.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.4'
gem 'html-pipeline', '~> 2.14.3'
gem 'deckar01-task_list', '2.3.2'
gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.6'
gem 'kramdown', '~> 2.3.1'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.3.2'
@ -170,12 +186,11 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.17'
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.16'
gem 'asciidoctor-kroki', '~> 0.5.0', require: false
gem 'asciidoctor-kroki', '~> 0.7.0', require: false
gem 'rouge', '~> 3.30.0'
gem 'truncato', '~> 0.7.12'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.13.8'
gem 'escape_utils', '~> 1.1'
gem 'nokogiri', '~> 1.13.9'
# Calendar rendering
gem 'icalendar'
@ -187,7 +202,7 @@ gem 'diff_match_patch', '~> 0.1.0'
# Application server
gem 'rack', '~> 2.2.4'
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'
group :puma do
gem 'puma', '~> 5.6.5', require: false
@ -202,16 +217,16 @@ gem 'state_machines-activerecord', '~> 0.8.0'
gem 'acts-as-taggable-on', '~> 9.0'
# Background jobs
gem 'sidekiq', '~> 6.4.0'
gem 'sidekiq-cron', '~> 1.4.0'
gem 'redis-namespace', '~> 1.8.1'
gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
gem 'sidekiq', '~> 6.5.7'
gem 'sidekiq-cron', '~> 1.8.0'
gem 'redis-namespace', '~> 1.9.0'
gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
gem 'fugit', '~> 1.2.1'
# HTTP requests
gem 'httparty', '~> 0.16.4'
gem 'httparty', '~> 0.20.0'
# Colored output to console
gem 'rainbow', '~> 3.0'
@ -223,20 +238,20 @@ gem 'ruby-progressbar', '~> 1.10'
gem 'settingslogic', '~> 2.0.9'
# Linear-time regex library for untrusted regular expressions
gem 're2', '~> 1.4.0'
gem 're2', '~> 1.6.0'
# Misc
gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.7'
gem 'js_regex', '~> 3.8'
# User agent parsing
gem 'device_detector'
# Redis
gem 'redis', '~> 4.7.0'
gem 'redis', '~> 4.8.0'
gem 'connection_pool', '~> 2.0'
# Redis session store
@ -262,7 +277,7 @@ gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
gem 'asana', '~> 0.10.13'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
gem 'ruby-fogbugz', '~> 0.3.0'
# Kubernetes integration
gem 'kubeclient', '~> 4.9.3'
@ -272,7 +287,7 @@ gem 'sanitize', '~> 6.0'
gem 'babosa', '~> 1.0.4'
# Sanitizes SVG input
gem 'loofah', '~> 2.18.0'
gem 'loofah', '~> 2.19.0'
# Working with license
# Detects the open source license the repository includes
@ -292,7 +307,7 @@ gem 'fast_blank'
gem 'gitlab-chronic', '~> 0.10.5'
gem 'gitlab_chronic_duration', '~> 0.10.6.2'
gem 'rack-proxy', '~> 0.7.2'
gem 'rack-proxy', '~> 0.7.4'
gem 'sassc-rails', '~> 2.1.0'
gem 'autoprefixer-rails', '10.2.5.1'
@ -301,13 +316,13 @@ gem 'terser', '1.0.2'
gem 'addressable', '~> 2.8'
gem 'tanuki_emoji', '~> 0.6'
gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5'
gem 'request_store', '~> 1.5.1'
gem 'base32', '~> 0.3.0'
gem 'gitlab-license', '~> 2.2.1'
# Protect against bruteforcing
gem 'rack-attack', '~> 6.6.0'
gem 'rack-attack', '~> 6.6.1'
# Sentry integration
gem 'sentry-raven', '~> 3.1'
@ -317,12 +332,12 @@ gem 'sentry-sidekiq', '~> 5.1.1'
# PostgreSQL query parsing
#
gem 'pg_query', '~> 2.1.0'
gem 'pg_query', '~> 2.2'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.24.0'
gem 'gitlab-labkit', '~> 0.28.0'
gem 'thrift', '>= 0.16.0'
# I18n
@ -347,12 +362,12 @@ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
gem 'lefthook', '~> 1.1.1', require: false
gem 'lefthook', '~> 1.2.0', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.46.0', require: false
gem 'solargraph', '~> 0.47.2', require: false
gem 'letter_opener_web', '~> 2.0.0'
gem 'lookbook', '~> 1.0'
gem 'lookbook', '~> 1.2', '>= 1.2.1'
# Better errors handler
gem 'better_errors', '~> 2.9.1'
@ -382,7 +397,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 8.0.0', require: false
gem 'gitlab-styles', '~> 9.0.0', require: false
gem 'haml_lint', '~> 0.40.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
@ -406,11 +421,11 @@ group :development, :test do
gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup'
gem 'pact', '~> 1.12'
gem 'pact', '~> 1.63'
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.5.2', require: false
gem 'gitlab-dangerfiles', '~> 3.6.2', require: false
end
group :development, :test, :coverage do
@ -460,10 +475,9 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
gem 'ruby-prof', '~> 1.3.0'
gem 'stackprof', '~> 0.2.21', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
gem 'memory_profiler', '~> 1.0', require: false
gem 'activerecord-explain-analyze', '~> 0.1', require: false
# OAuth
@ -486,16 +500,16 @@ gem 'ssh_data', '~> 1.3'
gem 'spamcheck', '~> 1.0.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 15.4.0-rc2'
gem 'gitaly', '~> 15.5.0'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.42.0'
gem 'google-protobuf', '~> 3.21'
gem 'google-protobuf', '~> 3.21', '>= 3.21.9'
gem 'toml-rb', '~> 2.0'
gem 'toml-rb', '~> 2.2.0'
# Feature toggles
gem 'flipper', '~> 0.25.0'
@ -519,8 +533,6 @@ gem 'retriable', '~> 3.1.2'
# LRU cache
gem 'lru_redux'
gem 'erubi', '~> 1.9.0'
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
# See https://gitlab.com/gitlab-org/gitlab/issues/197386
@ -539,6 +551,7 @@ gem 'valid_email', '~> 0.1'
gem 'json', '~> 2.5.1'
gem 'json_schemer', '~> 0.2.18'
gem 'oj', '~> 3.13.21'
gem 'oj-introspect', '~> 0.7'
gem 'multi_json', '~> 1.14.1'
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
@ -556,3 +569,15 @@ gem 'ed25519', '~> 1.3.0'
# Error Tracking OpenAPI client
# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
gem 'error_tracking_open_api', path: 'error_tracking_open_api'
# Vulnerability advisories
gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
# Work with RPM packages
gem 'arr-pm', '~> 0.0.12'
# Apple plist parsing
gem 'CFPropertyList'
# For phone verification
gem 'telesignenterprise', '~> 2.2'

498
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file

File diff suppressed because it is too large Load diff

703
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file

File diff suppressed because it is too large Load diff

13
pkgs/applications/version-management/gitlab/update-pg.patch
View file

@ -1,13 +0,0 @@
diff --git a/Gemfile.lock b/Gemfile.lock
index 9074b48c56b..57a1c924897 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1019,7 +1019,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
- pg (1.4.1)
+ pg (1.4.3)
pg_query (2.1.4)
google-protobuf (>= 3.19.2)
plist (3.6.0)

7
pkgs/applications/version-management/gitlab/update.py
View file

@ -23,9 +23,9 @@ VENDORED_GEMS = [
"omniauth-azure-oauth2",
"omniauth-cas3",
"omniauth-gitlab",
"omniauth-google-oauth2",
"omniauth_crowd",
"omniauth-salesforce",
"attr_encrypted",
"mail-smtp_pool",
"microsoft_graph_mailer",
"ipynbdiff",
@ -159,11 +159,6 @@ def update_rubyenv():
gemfile = repo.get_file('Gemfile', rev)
gemfile_lock = repo.get_file('Gemfile.lock', rev)
if "pg (1.4.1)" in gemfile_lock:
gemfile_lock = gemfile_lock.replace("pg (1.4.1)", "pg (1.4.3)")
else:
logger.info("Looks like pg was updated! Please remove update-pg.patch, as this will cause a build failure")
with open(rubyenv_dir / 'Gemfile', 'w') as f:
f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile))

123
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

4
pkgs/development/compilers/hip/default.nix
View file

@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)"
if [[ "$version" != "$current_version" ]]; then
tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")"
@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
echo hip already up-to-date
fi
version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)"
if [[ "$version" != "$current_version" ]]; then
tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")"

2
pkgs/development/compilers/llvm/rocm/llvm.nix
View file

@ -66,7 +66,7 @@ in stdenv.mkDerivation (finalAttrs: {
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/llvm-project/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
current_version="$(grep "version =" pkgs/development/compilers/llvm/rocm/default.nix | cut -d'"' -f2)"
if [[ "$version" != "$current_version" ]]; then
tarball_meta="$(nix-prefetch-github RadeonOpenCompute llvm-project --rev "rocm-$version")"

17
pkgs/development/compilers/nim/default.nix
View file

@ -71,16 +71,27 @@ let
nimHost = parsePlatform stdenv.hostPlatform;
nimTarget = parsePlatform stdenv.targetPlatform;
bootstrapCompiler = stdenv.mkDerivation {
pname = "nim-bootstrap";
inherit (nim-unwrapped) version src;
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -Dt $out/bin bin/nim
runHook postInstall
'';
};
in {
nim-unwrapped = stdenv.mkDerivation rec {
pname = "nim-unwrapped";
version = "1.6.8";
version = "1.6.10";
strictDeps = true;
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
hash = "sha256-D1tlzbYPeK9BywdcI4mDaJoeH34lyBnxeYYsGKSEz1c=";
hash = "sha256-E9dwL4tXCHur6M0FHBO8VqMXFBi6hntJxrvQmynST+o=";
};
buildInputs = [ boehmgc openssl pcre readline sqlite ];
@ -95,6 +106,7 @@ in {
configurePhase = ''
runHook preConfigure
cp ${bootstrapCompiler}/bin/nim bin/
echo 'define:nixbuild' >> config/nim.cfg
runHook postConfigure
'';
@ -112,7 +124,6 @@ in {
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
sed -i "s/aarch64/arm64/g" makefile
'' + ''
make -j$NIX_BUILD_CORES
./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES

18
pkgs/development/interpreters/bqn/cbqn/default.nix
View file

@ -5,6 +5,7 @@
, bqn-path ? null
, mbqn-source ? null
, libffi
, pkg-config
}:
let
@ -20,15 +21,20 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
version = "0.pre+date=2022-10-04";
version = "0.pre+date=2022-11-27";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "abcb575a537712763e9e53b6cb0eb415346b00e6";
hash = "sha256:05gqw2ppcykv36ji8mkp8mq502q84vk9algp9c2d3z495xqy8rn6";
rev = "dbc7c83f7085d05e87721bedf1ee38931f671a8e";
hash = "sha256:0nal1fs9y7nyx4d5q1qw868lxk7mivzw2y16wc3hw97pq4qf0dpb";
};
nativeBuildInputs = [
pkg-config
];
# TODO(@sternenseemann): allow building against dzaima's replxx fork
buildInputs = [
libffi
];
@ -45,11 +51,11 @@ stdenv.mkDerivation rec {
preBuild = ''
# Purity: avoids git downloading bytecode files
touch src/gen/customRuntime
mkdir -p build/bytecodeLocal/gen
'' + (if genBytecode then ''
${bqn-path} genRuntime ${mbqn-source}
${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/
'' else ''
cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} src/gen/
cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/
'')
# Need to adjust ld flags for darwin manually
# https://github.com/dzaima/CBQN/issues/26

6
pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
View file

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bqn";
version = "0.pre+date=2022-10-03";
version = "0.pre+date=2022-11-24";
src = fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
rev = "1518205cceeb1fef27c584d24e92b189ffd234f4";
hash = "sha256:1pyk331ymbs2fv9jxmbv28yvk9mr2mcni1dsja6fzkk1jrd767hy";
rev = "976bd82fb0e830876cca117c302c8a19048033a4";
hash = "sha256:1nhn30ypc2zvq58b3zi66ypc9wv3v8cryn43cqihazc1lq8qxqdw";
};
nativeBuildInputs = [ makeWrapper ];

12
pkgs/development/libraries/clang-ocl/default.nix
View file

@ -10,13 +10,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "clang-ocl";
rocmVersion = "5.3.3";
version = finalAttrs.rocmVersion;
version = "5.3.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "clang-ocl";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0=";
};
@ -38,8 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version clang-ocl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/RadeonOpenCompute/clang-ocl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version clang-ocl "$version" --ignore-same-hash
'';
meta = with lib; {
@ -47,6 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/RadeonOpenCompute/clang-ocl";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != clang.version;
broken = finalAttrs.version != clang.version;
};
})

19
pkgs/development/libraries/composable_kernel/default.nix
View file

@ -5,19 +5,12 @@
, rocm-cmake
, hip
, openmp
, gtest ? null
, gtest
, buildTests ? false
, buildExamples ? false
, gpuTargets ? null # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ]
, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ]
}:
assert buildTests -> gtest != null;
# Several tests seem to either not compile or have a race condition
# Undefined reference to symbol '_ZTIN7testing4TestE'
# Try removing this next update
assert buildTests == false;
stdenv.mkDerivation (finalAttrs: {
pname = "composable_kernel";
version = "unstable-2022-11-19";
@ -54,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-DCMAKE_C_COMPILER=hipcc"
"-DCMAKE_CXX_COMPILER=hipcc"
] ++ lib.optionals (gpuTargets != null) [
"-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
] ++ lib.optionals (gpuTargets != [ ]) [
"-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
];
# No flags to build selectively it seems...
@ -89,5 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
# Several tests seem to either not compile or have a race condition
# Undefined reference to symbol '_ZTIN7testing4TestE'
# Try removing this next update
broken = buildTests;
};
})

23
pkgs/development/libraries/hipcub/default.nix
View file

@ -9,21 +9,16 @@
, rocm-comgr
, rocprim
, hip
, gtest ? null
, gbenchmark ? null
, gtest
, gbenchmark
, buildTests ? false
, buildBenchmarks ? false
}:
assert buildTests -> gtest != null;
assert buildBenchmarks -> gbenchmark != null;
# CUB can also be used as a backend instead of rocPRIM.
stdenv.mkDerivation (finalAttrs: {
pname = "hipcub";
repoVersion = "2.12.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -36,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "hipCUB";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g=";
};
@ -84,11 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version hipcub "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version hipcub "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipCUB/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version hipcub "$version" --ignore-same-hash
'';
meta = with lib; {
@ -96,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB";
license = with licenses; [ bsd3 ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

20
pkgs/development/libraries/hipsparse/default.nix
View file

@ -11,18 +11,14 @@
, hip
, gfortran
, git
, gtest ? null
, gtest
, buildTests ? false
}:
assert buildTests -> gtest != null;
# This can also use cuSPARSE as a backend instead of rocSPARSE
stdenv.mkDerivation (finalAttrs: {
pname = "hipsparse";
repoVersion = "2.3.1";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -33,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "hipSPARSE";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c=";
};
@ -119,11 +115,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version hipsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version hipsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/hipSPARSE/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version hipsparse "$version" --ignore-same-hash
'';
meta = with lib; {
@ -131,6 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

8
pkgs/development/libraries/lirc/default.nix
View file

@ -22,11 +22,11 @@ let
in
stdenv.mkDerivation rec {
pname = "lirc";
version = "0.10.1";
version = "0.10.2";
src = fetchurl {
url = "mirror://sourceforge/lirc/${pname}-${version}.tar.bz2";
sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
sha256 = "sha256-PUTsgnSIHPJi8WCAVkHwgn/8wgreDYXn5vO5Dg09Iio=";
};
patches = [
@ -66,9 +66,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook help2man libxslt pythonEnv ];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook help2man libxslt pythonEnv pkg-config ];
buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ];

57
pkgs/development/libraries/miopen/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchurl
, writeScript
, pkg-config
, cmake
@ -21,13 +22,12 @@
, boost
, sqlite
, bzip2
, texlive ? null
, doxygen ? null
, sphinx ? null
, python3Packages ? null
, zlib ? null
, fetchurl ? null
, buildDocs ? false
, texlive
, doxygen
, sphinx
, zlib
, python3Packages
, buildDocs ? true
, buildTests ? false
# LFS isn't working, so we will manually fetch these
# This isn't strictly required, but is recommended
@ -36,15 +36,8 @@
, useOpenCL ? false
}:
assert buildDocs -> texlive != null;
assert buildDocs -> doxygen != null;
assert buildDocs -> sphinx != null;
assert buildDocs -> python3Packages != null;
assert buildTests -> zlib != null;
assert fetchKDBs -> fetchurl != null;
let
latex = lib.optionalAttrs buildDocs (texlive.combine {
latex = lib.optionalAttrs buildDocs texlive.combine {
inherit (texlive) scheme-small
latexmk
tex-gyre
@ -56,7 +49,7 @@ let
tabulary
varwidth
titlesec;
});
};
kdbs = lib.optionalAttrs fetchKDBs import ./deps.nix {
inherit fetchurl;
@ -64,11 +57,7 @@ let
};
in stdenv.mkDerivation (finalAttrs: {
pname = "miopen";
# We have to manually specify the repoVersion for now
# Find the github release or `-- MIOpen_VERSION= X.X.X` in the build log
repoVersion = "2.18.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -81,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "MIOpen";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-5/JitdGJ0afzK4pGOOywRLsB3/Thc6/71sRkKIxf2Lg=";
};
@ -112,7 +101,7 @@ in stdenv.mkDerivation (finalAttrs: {
latex
doxygen
sphinx
python3Packages.sphinx_rtd_theme
python3Packages.sphinx-rtd-theme
python3Packages.breathe
python3Packages.myst-parser
] ++ lib.optionals buildTests [
@ -179,27 +168,21 @@ in stdenv.mkDerivation (finalAttrs: {
postInstall = ''
rm $out/bin/install_precompiled_kernels.sh
'' + lib.optionalString buildDocs ''
mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"}
mv ../doc/pdf/miopen.pdf $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"}
'' + lib.optionalString buildTests ''
mkdir -p $test/bin
mv bin/test_* $test/bin
patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.nativeBuildInputs ++ finalAttrs.buildInputs)}:$out/lib $test/bin/*
'';
postFixup = lib.optionalString (buildDocs && !useOpenCL) ''
export docDir=$doc/share/doc/miopen-hip
'' + lib.optionalString (buildDocs && useOpenCL) ''
export docDir=$doc/share/doc/miopen-opencl
'' + lib.optionalString buildDocs ''
mkdir -p $docDir
mv ../doc/html $docDir
mv ../doc/pdf/miopen.pdf $docDir
patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])}:$out/lib $test/bin/*
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpen/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version miopen "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpen/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version miopen "$version" --ignore-same-hash
'';
meta = with lib; {
@ -207,7 +190,7 @@ in stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
# MIOpen will produce a very large output due to KDBs fetched
# Also possibly in the future because of KDB generation
hydraPlatforms = [ ];

49
pkgs/development/libraries/miopengemm/default.nix
View file

@ -6,24 +6,18 @@
, rocm-cmake
, rocm-opencl-runtime
, clang
, texlive ? null
, doxygen ? null
, sphinx ? null
, python3Packages ? null
, openblas ? null
, buildDocs ? false
, texlive
, doxygen
, sphinx
, openblas
, python3Packages
, buildDocs ? true
, buildTests ? false
, buildBenchmarks ? false
}:
assert buildDocs -> texlive != null;
assert buildDocs -> doxygen != null;
assert buildDocs -> sphinx != null;
assert buildDocs -> python3Packages != null;
assert buildTests -> openblas != null;
let
latex = lib.optionalAttrs buildDocs (texlive.combine {
latex = lib.optionalAttrs buildDocs texlive.combine {
inherit (texlive) scheme-small
latexmk
tex-gyre
@ -35,16 +29,15 @@ let
tabulary
varwidth
titlesec;
});
};
in stdenv.mkDerivation (finalAttrs: {
pname = "miopengemm";
rocmVersion = "5.3.3";
version = finalAttrs.rocmVersion;
version = "5.3.3";
outputs = [
"out"
] ++ lib.optionals buildDocs [
"docs"
"doc"
] ++ lib.optionals buildTests [
"test"
] ++ lib.optionals buildBenchmarks [
@ -54,7 +47,7 @@ in stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "MIOpenGEMM";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc=";
};
@ -70,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: {
latex
doxygen
sphinx
python3Packages.sphinx_rtd_theme
python3Packages.sphinx-rtd-theme
python3Packages.breathe
] ++ lib.optionals buildTests [
openblas
@ -104,7 +97,10 @@ in stdenv.mkDerivation (finalAttrs: {
make examples
'';
postInstall = lib.optionalString buildTests ''
postInstall = lib.optionalString buildDocs ''
mv ../doc/html $out/share/doc/miopengemm
mv ../doc/pdf/miopengemm.pdf $out/share/doc/miopengemm
'' + lib.optionalString buildTests ''
mkdir -p $test/bin
find tests -executable -type f -exec mv {} $test/bin \;
patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $test/bin/*
@ -114,17 +110,12 @@ in stdenv.mkDerivation (finalAttrs: {
patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/*
'';
postFixup = lib.optionalString buildDocs ''
mkdir -p $docs/share/doc/miopengemm
mv ../doc/html $docs/share/doc/miopengemm
mv ../doc/pdf/miopengemm.pdf $docs/share/doc/miopengemm
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version miopengemm "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpenGEMM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version miopengemm "$version" --ignore-same-hash
'';
meta = with lib; {
@ -132,6 +123,6 @@ in stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != clang.version;
broken = finalAttrs.version != clang.version;
};
})

20
pkgs/development/libraries/rccl/default.nix
View file

@ -10,17 +10,13 @@
, rocm-smi
, hip
, gtest
, chrpath ? null
, chrpath
, buildTests ? false
}:
assert buildTests -> chrpath != null;
stdenv.mkDerivation (finalAttrs: {
pname = "rccl";
repoVersion = "2.12.10";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -31,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rccl";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk=";
};
@ -79,11 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rccl/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rccl "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rccl "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rccl/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rccl "$version" --ignore-same-hash
'';
meta = with lib; {
@ -91,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rccl";
license = with licenses; [ bsd2 bsd3 ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

47
pkgs/development/libraries/rocblas/default.nix
View file

@ -10,13 +10,13 @@
, rocm-comgr
, hip
, python3
, tensile ? null
, msgpack ? null
, libxml2 ? null
, llvm ? null
, python3Packages ? null
, gtest ? null
, gfortran ? null
, tensile
, msgpack
, libxml2
, llvm
, gtest
, gfortran
, python3Packages
, buildTensile ? true
, buildTests ? false
, buildBenchmarks ? false
@ -28,29 +28,14 @@
, gpuTargets ? [ "all" ]
}:
assert buildTensile -> tensile != null;
assert buildTensile -> msgpack != null;
assert buildTensile -> libxml2 != null;
assert buildTensile -> llvm != null;
assert buildTensile -> python3Packages != null;
assert buildTests -> gtest != null;
assert buildTests -> gfortran != null;
# Tests and benchmarks are a can of worms that I will tackle in a different PR
# It involves completely rewriting the amd-blis derivation
assert buildTests == false;
assert buildBenchmarks == false;
stdenv.mkDerivation (finalAttrs: {
pname = "rocblas";
repoVersion = "2.45.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocBLAS";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo=";
};
@ -90,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_C_COMPILER=hipcc"
"-DCMAKE_CXX_COMPILER=hipcc"
"-Dpython=python3"
"-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
"-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
"-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}"
# Manually define CMAKE_INSTALL_<DIR>
# See: https://github.com/NixOS/nixpkgs/pull/197838
@ -131,11 +116,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocBLAS/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocblas "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocblas "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocBLAS/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocblas "$version" --ignore-same-hash
'';
meta = with lib; {
@ -143,6 +126,8 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
# Tests and benchmarks are a can of worms that I will tackle in a different PR
# It involves completely rewriting the amd-blis derivation
broken = finalAttrs.version != hip.version || buildTests || buildBenchmarks;
};
})

2
pkgs/development/libraries/rocclr/default.nix
View file

@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/ROCm-Developer-Tools/ROCclr/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocclr "$version" --ignore-same-hash
'';

32
pkgs/development/libraries/rocfft/default.nix
View file

@ -10,26 +10,18 @@
, hip
, sqlite
, python3
, gtest ? null
, boost ? null
, fftw ? null
, fftwFloat ? null
, llvmPackages ? null
, gtest
, boost
, fftw
, fftwFloat
, llvmPackages
, buildTests ? false
, buildBenchmarks ? false
}:
assert buildTests -> gtest != null;
assert buildBenchmarks -> fftw != null;
assert buildBenchmarks -> fftwFloat != null;
assert (buildTests || buildBenchmarks) -> boost != null;
assert (buildTests || buildBenchmarks) -> llvmPackages != null;
stdenv.mkDerivation (finalAttrs: {
pname = "rocfft";
repoVersion = "1.0.18";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -42,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocFFT";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM=";
};
@ -109,11 +101,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocFFT/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocfft "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocfft "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocFFT/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocfft "$version" --ignore-same-hash
'';
meta = with lib; {
@ -121,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
hydraPlatforms = [ ]; # rocFFT produces an extremely large output
};
})

2
pkgs/development/libraries/rocm-comgr/default.nix
View file

@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-CompilerSupport/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-comgr "$version" --ignore-same-hash
'';

2
pkgs/development/libraries/rocm-device-libs/default.nix
View file

@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-Device-Libs/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-device-libs "$version" --ignore-same-hash
'';

2
pkgs/development/libraries/rocm-opencl-runtime/default.nix
View file

@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCm-OpenCL-Runtime/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocm-opencl-runtime "$version" --ignore-same-hash
'';

2
pkgs/development/libraries/rocm-runtime/default.nix
View file

@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCR-Runtime/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-runtime "$version" --ignore-same-hash
'';

2
pkgs/development/libraries/rocm-thunk/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/ROCT-Thunk-Interface/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocm-thunk "$version" --ignore-same-hash
'';

12
pkgs/development/libraries/rocmlir/default.nix
View file

@ -9,13 +9,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocmlir";
rocmVersion = "5.3.3";
version = finalAttrs.rocmVersion;
version = "5.3.3";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocMLIR";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ=";
};
@ -35,8 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocMLIR/tags?per_page=2" | jq '.[1].name | split("-") | .[1]' --raw-output)"
update-source-version rocmlir "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocMLIR/tags?per_page=2" | jq '.[1].name | split("-") | .[1]' --raw-output)"
update-source-version rocmlir "$version" --ignore-same-hash
'';
meta = with lib; {
@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
license = with licenses; [ asl20 ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

23
pkgs/development/libraries/rocprim/default.nix
View file

@ -8,20 +8,15 @@
, rocm-device-libs
, rocm-comgr
, hip
, gtest ? null
, gbenchmark ? null
, gtest
, gbenchmark
, buildTests ? false
, buildBenchmarks ? false
}:
assert buildTests -> gtest != null;
assert buildBenchmarks -> gbenchmark != null;
stdenv.mkDerivation (finalAttrs: {
pname = "rocprim";
repoVersion = "2.11.1";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -34,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocPRIM";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U=";
};
@ -80,11 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocPRIM/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocprim "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocprim "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocPRIM/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocprim "$version" --ignore-same-hash
'';
meta = with lib; {
@ -92,6 +85,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

23
pkgs/development/libraries/rocrand/default.nix
View file

@ -8,20 +8,15 @@
, rocm-device-libs
, rocm-comgr
, hip
, gtest ? null
, gbenchmark ? null
, gtest
, gbenchmark
, buildTests ? false
, buildBenchmarks ? false
}:
assert buildTests -> gtest != null;
assert buildBenchmarks -> gbenchmark != null;
stdenv.mkDerivation (finalAttrs: {
pname = "rocrand";
repoVersion = "2.10.15";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -34,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocRAND";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-awQLqPmhVxegrqqSoC8fiCQJ33bPKZlljSAXnHVcIZo=";
fetchSubmodules = true; # For inline hipRAND
};
@ -83,11 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocRAND/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocrand "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocrand "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocRAND/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocrand "$version" --ignore-same-hash
'';
meta = with lib; {
@ -95,6 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

26
pkgs/development/libraries/rocsparse/default.nix
View file

@ -12,22 +12,16 @@
, hip
, gfortran
, git
, gtest ? null
, boost ? null
, python3Packages ? null
, gtest
, boost
, python3Packages
, buildTests ? false
, buildBenchmarks ? false # Seems to depend on tests
}:
assert (buildTests || buildBenchmarks) -> gtest != null;
assert (buildTests || buildBenchmarks) -> boost != null;
assert (buildTests || buildBenchmarks) -> python3Packages != null;
stdenv.mkDerivation (finalAttrs: {
pname = "rocsparse";
repoVersion = "2.3.2";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
@ -40,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocSPARSE";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0=";
};
@ -143,11 +137,9 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocsparse "$version" --ignore-same-hash
'';
};
@ -156,6 +148,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
broken = finalAttrs.version != hip.version;
};
})

27
pkgs/development/libraries/rocthrust/default.nix
View file

@ -9,23 +9,14 @@
, rocm-comgr
, rocprim
, hip
, gtest ? null
, gtest
, buildTests ? false
, buildBenchmarks ? false
}:
assert buildTests -> gtest != null;
# Doesn't seem to work, thousands of errors compiling with no clear fix
# Is this an upstream issue? We don't seem to be missing dependencies
assert buildTests == false;
assert buildBenchmarks == false;
stdenv.mkDerivation (finalAttrs: {
pname = "rocthrust";
repoVersion = "2.16.0";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
# Comment out these outputs until tests/benchmarks are fixed (upstream?)
# outputs = [
@ -39,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocThrust";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw=";
};
@ -86,11 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocThrust/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocthrust "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocthrust "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocThrust/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocthrust "$version" --ignore-same-hash
'';
meta = with lib; {
@ -98,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust";
license = with licenses; [ asl20 ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
# Tests/Benchmarks don't seem to work, thousands of errors compiling with no clear fix
# Is this an upstream issue? We don't seem to be missing dependencies
broken = finalAttrs.version != hip.version || buildTests || buildBenchmarks;
};
})

70
pkgs/development/libraries/rocwmma/default.nix
View file

@ -6,31 +6,20 @@
, rocm-cmake
, hip
, openmp
, gtest ? null
, rocblas ? null
, texlive ? null
, doxygen ? null
, sphinx ? null
, python3Packages ? null
, gtest
, rocblas
, texlive
, doxygen
, sphinx
, python3Packages
, buildDocs ? true
, buildTests ? false
, buildSamples ? false
, buildDocs ? false
, gpuTargets ? null # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ]
, gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ]
}:
assert buildTests -> gtest != null;
assert buildTests -> rocblas != null;
assert buildDocs -> texlive != null;
assert buildDocs -> doxygen != null;
assert buildDocs -> sphinx != null;
assert buildDocs -> python3Packages != null;
# Building tests isn't working for now
# undefined reference to symbol '_ZTIN7testing4TestE'
assert buildTests == false;
let
latex = lib.optionalAttrs buildDocs (texlive.combine {
latex = lib.optionalAttrs buildDocs texlive.combine {
inherit (texlive) scheme-small
latexmk
tex-gyre
@ -42,27 +31,25 @@ let
tabulary
varwidth
titlesec;
});
};
in stdenv.mkDerivation (finalAttrs: {
pname = "rocwmma";
repoVersion = "0.8";
rocmVersion = "5.3.3";
version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
version = "5.3.3";
outputs = [
"out"
] ++ lib.optionals buildDocs [
"doc"
] ++ lib.optionals buildTests [
"test"
] ++ lib.optionals buildSamples [
"sample"
] ++ lib.optionals buildDocs [
"docs"
];
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocWMMA";
rev = "rocm-${finalAttrs.rocmVersion}";
rev = "rocm-${finalAttrs.version}";
hash = "sha256-wU3R1XGTy7uFbceUyE0wy+XayicuyJIVfd1ih6pbTN0=";
};
@ -85,7 +72,7 @@ in stdenv.mkDerivation (finalAttrs: {
latex
doxygen
sphinx
python3Packages.sphinx_rtd_theme
python3Packages.sphinx-rtd-theme
python3Packages.breathe
];
@ -98,8 +85,8 @@ in stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
] ++ lib.optionals (gpuTargets != null) [
"-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
] ++ lib.optionals (gpuTargets != [ ]) [
"-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
] ++ lib.optionals buildTests [
"-DROCWMMA_BUILD_VALIDATION_TESTS=ON"
"-DROCWMMA_BUILD_BENCHMARK_TESTS=ON"
@ -119,7 +106,10 @@ in stdenv.mkDerivation (finalAttrs: {
../docs/run_doc.sh
'';
postInstall = lib.optionalString buildTests ''
postInstall = lib.optionalString buildDocs ''
mv ../docs/source/_build/html $out/share/doc/rocwmma
mv ../docs/source/_build/latex/rocWMMA.pdf $out/share/doc/rocwmma
'' + lib.optionalString buildTests ''
mkdir -p $test/bin
mv $out/bin/*_test* $test/bin
'' + lib.optionalString buildSamples ''
@ -131,20 +121,12 @@ in stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin
'';
postFixup = lib.optionalString buildDocs ''
mkdir -p $docs/share/doc/rocwmma
mv ../docs/source/_build/html $docs/share/doc/rocwmma
mv ../docs/source/_build/latex/rocWMMA.pdf $docs/share/doc/rocwmma
'';
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocWMMA/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocwmma "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version rocwmma "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocWMMA/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocwmma "$version" --ignore-same-hash
'';
meta = with lib; {
@ -152,6 +134,8 @@ in stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA";
license = with licenses; [ mit ];
maintainers = teams.rocm.members;
broken = finalAttrs.rocmVersion != hip.version;
# Building tests isn't working for now
# undefined reference to symbol '_ZTIN7testing4TestE'
broken = finalAttrs.version != hip.version || buildTests;
};
})

14
pkgs/development/libraries/tensile/default.nix
View file

@ -10,14 +10,12 @@
buildPythonPackage rec {
pname = "tensile";
repoVersion = "4.34.0";
rocmVersion = "5.3.3";
version = "${repoVersion}-${rocmVersion}";
version = "5.3.3";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "Tensile";
rev = "rocm-${rocmVersion}";
rev = "rocm-${version}";
hash = "sha256-6A7REYdIw/ZmjrJh7B+wCXZMleh4bf04TFpRItPtctA=";
};
@ -30,11 +28,9 @@ buildPythonPackage rec {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/Tensile/releases?per_page=1")"
repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version tensile "$repoVersion" --ignore-same-hash --version-key=repoVersion
update-source-version tensile "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-sL "https://api.github.com/repos/ROCmSoftwarePlatform/Tensile/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version tensile "$version" --ignore-same-hash
'';
meta = with lib; {

46
pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
View file

@ -1,46 +0,0 @@
{ stdenv
, lib
, fetchFromGitHub
, ocaml
, findlib
, ocamlbuild
, oasis
, camlp4
, num
}:
if lib.versionOlder ocaml.version "4.03"
then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ocsigen-deriving";
version = "0.8.2";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "deriving";
rev = version;
sha256 = "sha256:09rp9mrr551na0nmclpxddlrkb6l2d7763xv14xfx467kff3z0wf";
};
createFindlibDestdir = true;
nativeBuildInputs = [ ocaml findlib ocamlbuild oasis camlp4 ];
buildInputs = [ oasis camlp4 ocamlbuild num ];
strictDeps = true;
meta = {
homepage = "https://github.com/ocsigen/deriving";
description = "Extension to OCaml for deriving functions from type declarations";
license = lib.licenses.mit;
inherit (ocaml.meta) platforms;
maintainers = with lib.maintainers; [
gal_bolle
vbgl
];
};
}

66
pkgs/development/python-modules/asyncua/default.nix Normal file
View file

@ -0,0 +1,66 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, aiosqlite
, aiofiles
, pytz
, python-dateutil
, sortedcontainers
, cryptography
, typing-extensions
, importlib-metadata
, pytestCheckHook
, pytest-asyncio
, pytest-mock
, asynctest
, pythonOlder
}:
buildPythonPackage rec {
pname = "asyncua";
version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "FreeOpcUa";
repo = "opcua-asyncio";
rev = "v${version}";
hash = "sha256-wBtI3ZlsvOkNvl/q0X9cm2hNRUBW1oB/kZOo8lqo4dQ=";
};
propagatedBuildInputs = [
aiosqlite
aiofiles
pytz
python-dateutil
sortedcontainers
cryptography
typing-extensions
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
pythonImportsCheck = [
"asyncua"
];
checkInputs = [
pytestCheckHook
pytest-asyncio
pytest-mock
asynctest
];
disabledTests = [
"test_cli_tools_which_require_sigint" # Hard coded path only works from root of src
];
meta = with lib; {
description = "OPC UA / IEC 62541 Client and Server for Python";
homepage = "https://github.com/FreeOpcUa/opcua-asyncio";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ harvidsen ];
};
}

30
pkgs/development/python-modules/cypherpunkpay/default.nix
View file

@ -36,7 +36,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'monero = "^0.99"' 'monero = ">=0.99"' \
--replace "bitstring = '^3.1.9'" "bitstring = '>=3.1.9'" \
--replace 'cffi = "1.15.0"' 'cffi = ">=1.15.0"' \
--replace 'ecdsa = "^0.17.0"' 'ecdsa = ">=0.17.0"' \
--replace 'pypng = "^0.0.20"' 'pypng = ">=0.0.20"' \
--replace 'tzlocal = "2.1"' 'tzlocal = ">=2.1"'
'';
@ -70,22 +72,26 @@ buildPythonPackage rec {
disabledTestPaths = [
# performance test
"test/unit/tools/pbkdf2_test.py"
"tests/unit/tools/pbkdf2_test.py"
# tests require network connection
"test/network/explorers/bitcoin"
"test/network/net/http_client"
"test/network/prices"
"tests/network/explorers/bitcoin"
"tests/network/monero/monero_address_transactions_db_test.py"
"tests/network/net/http_client"
"tests/network/prices"
# tests require bitcoind running
"test/network/full_node_clients"
"tests/network/full_node_clients"
# tests require lnd running
"test/network/ln"
"tests/network/ln"
# tests require tor running
"test/network/net/tor_client"
"tests/network/monero/monero_test.py"
"tests/network/net/tor_client"
"tests/network/usecases/calc_monero_address_credits_uc_test.py"
"tests/network/usecases/fetch_monero_txs_from_open_node_uc_test.py"
# tests require the full environment running
"test/acceptance/views"
"test/acceptance/views_admin"
"test/acceptance/views_donations"
"test/acceptance/views_dummystore"
"tests/acceptance/views"
"tests/acceptance/views_admin"
"tests/acceptance/views_donations"
"tests/acceptance/views_dummystore"
];
meta = with lib; {

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

@ -5,7 +5,6 @@
, dj-search-url
, django
, django-cache-url
, django-discover-runner
, fetchPypi
, importlib-metadata
, mock
@ -36,7 +35,6 @@ buildPythonPackage rec {
];
checkInputs = [
django-discover-runner
mock
dj-database-url
dj-email-url

27
pkgs/development/python-modules/django-discover-runner/default.nix
View file

@ -1,27 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, django
}:
buildPythonPackage rec {
version = "1.0";
pname = "django-discover-runner";
src = fetchPypi {
inherit pname version;
sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe";
};
propagatedBuildInputs = [ django ];
# tests not included with release
doCheck = false;
meta = with lib; {
homepage = "https://github.com/jezdez/django-discover-runner";
description = "A Django test runner based on unittest2's test discovery";
license = licenses.bsd0;
maintainers = [ maintainers.costrouc ];
};
}

4
pkgs/development/tools/altair-graphql-client/default.nix
View file

@ -2,11 +2,11 @@
let
pname = "altair";
version = "4.6.2";
version = "5.0.5";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-D2Ivem7xg4KrAHYxs4Cx7Ekgyc5u2KrjX4miYz11wuI=";
sha256 = "sha256-dBIY7VINBI7hPTzkdPEq2iwWMNkpr6aVfVTHQR2eZ0w=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

2
pkgs/development/tools/build-managers/rocm-cmake/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocm-cmake/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocm-cmake "$version" --ignore-same-hash
'';

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

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.28.1";
version = "1.28.2";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "sha256-WAFWLpBr+Lfy3etPgSrdo6iitCawIPCf8UwvnW24LRI=";
sha256 = "sha256-1WB+lm2k7q4xViCUBhvCSuMCIlCMlAJ9etRajwGyOQs=";
};
outputs = [ "out" "man" ];

4
pkgs/development/tools/flatpak-builder/default.nix
View file

@ -46,13 +46,13 @@ let
installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
in stdenv.mkDerivation rec {
pname = "flatpak-builder";
version = "1.2.2";
version = "1.2.3";
outputs = [ "out" "doc" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-if2mjlN8Hp3gI1JpC9icMhenKRZFWNNfNbCPea2E4D4=";
sha256 = "sha256-4leCWkf3o+ceMPsPgPLZrG5IAfdG9VLfrw5WTj7jUcg=";
};
patches = [

16
pkgs/development/tools/jet/default.nix
View file

@ -2,32 +2,22 @@
buildGraalvmNativeImage rec {
pname = "jet";
version = "0.1.0";
version = "0.3.21";
src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-RCEIIZfPmOLW3akjEgaEas4xOtYxL6lQsxDv2szB8K4";
};
reflectionJson = fetchurl {
url = "https://raw.githubusercontent.com/borkdude/${pname}/v${version}/reflection.json";
sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q=";
sha256 = "sha256-p7jTPnXpDg1bbPMEmznFWNZ4lq/zt2fZUOE6IOc9akY=";
};
extraNativeImageBuildArgs = [
"-H:+ReportExceptionStackTraces"
"-J-Dclojure.spec.skip-macros=true"
"-J-Dclojure.compiler.direct-linking=true"
"-H:IncludeResources=JET_VERSION"
"-H:ReflectionConfigurationFiles=${reflectionJson}"
"--initialize-at-build-time"
"-H:Log=registerResource:"
"--no-fallback"
"--no-server"
];
meta = with lib; {
description = "CLI to transform between JSON, EDN and Transit, powered with a minimal query language";
description = "CLI to transform between JSON, EDN, YAML and Transit, powered with a minimal query language";
homepage = "https://github.com/borkdude/jet";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.epl10;

28
pkgs/development/tools/misc/python-launcher/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ lib, rustPlatform, fetchFromGitHub, python3 }:
rustPlatform.buildRustPackage rec {
pname = "python-launcher";
version = "1.0.0";
src = fetchFromGitHub {
owner = "brettcannon";
repo = pname;
rev = "v${version}";
sha256 = "1r2pmli4jsdjag9zsgd9q1qlj3hxxjj2bni6yybjh1a10fcqxzzv";
};
cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4=";
checkInputs = [ python3 ];
dontUseCargoParallelTests = true;
meta = with lib; {
description = "An implementation of the `py` command for Unix-based platforms";
homepage = "https://github.com/brettcannon/python-launcher";
changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "py";
};
}

21
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
View file

@ -1,21 +0,0 @@
{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
buildDunePackage rec {
version = "3.2.1";
pname = "js_of_ocaml-camlp4";
useDune2 = false;
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
buildInputs = [ camlp4 ocsigen_deriving ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

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

@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocminfo/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)"
update-source-version rocminfo "$version" --ignore-same-hash
'';

4
pkgs/servers/home-automation/evcc/default.nix
View file

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "evcc";
version = "0.108.0";
version = "0.108.2";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-KCR001MbaAuzNsL8lXIMkfliWviGFVroaQWYBruXUTY=";
hash = "sha256-vhgqsKwgK27cbmyoTdR6QFCKrG5tRfSutp6DsDDsCTU=";
};
vendorHash = "sha256-10W1BNHcdP77m7lJ/mc+jQeUigoUid3K0wI4bUm5y+s=";

65
pkgs/tools/graphics/dynamic-wallpaper/default.nix Normal file
View file

@ -0,0 +1,65 @@
{ lib
, python3
, fetchFromGitHub
, meson
, ninja
, pkg-config
, blueprint-compiler
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
, glib
, gtk4
, libadwaita
, librsvg
}:
python3.pkgs.buildPythonApplication rec {
pname = "dynamic-wallpaper";
version = "0.1.0";
format = "other";
src = fetchFromGitHub {
owner = "dusansimic";
repo = pname;
rev = version;
hash = "sha256-DAdx34EYO8ysQzbWrAIPoghhibwFtoqCi8oyDVyO5lk=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
blueprint-compiler
wrapGAppsHook4
appstream-glib
desktop-file-utils
];
buildInputs = [
glib
gtk4
libadwaita
librsvg
];
propagatedBuildInputs = with python3.pkgs; [
pygobject3
];
# Prevent double wrapping
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
description = "Dynamic wallpaper maker for Gnome";
homepage = "https://github.com/dusansimic/dynamic-wallpaper";
license = licenses.gpl2;
platforms = platforms.linux;
mainProgram = "me.dusansimic.DynamicWallpaper";
maintainers = with maintainers; [ zendo ];
};
}

4
pkgs/tools/security/buttercup-desktop/default.nix
View file

@ -2,10 +2,10 @@
let
pname = "buttercup-desktop";
version = "2.16.0";
version = "2.17.0";
src = fetchurl {
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
sha256 = "sha256-o6KdbwD0VdCTYLEfar7Jt7MRZUayGHyasnmtU8Cqg3E=";
sha256 = "sha256-JD3ZFRWGCJq5VDGkTgIZuZPScQrNF4vsuCavBD3pigA=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };

6
pkgs/tools/security/inql/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "inql";
version = "4.0.5";
version = "4.0.6";
src = fetchFromGitHub {
owner = "doyensec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0LPJMCg7F9kcPcq4jkADdCPNLfRThXu8QHy4qOn7+QU=";
rev = "refs/tags/v${version}";
sha256 = "sha256-DFGJHqdrCmOZn8GdY5SZ1PrOhuIsMLoK+2Fry9WkRiY=";
};
propagatedBuildInputs = with python3.pkgs; [

2
pkgs/tools/system/rocm-smi/default.nix
View file

@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
version="$(curl -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
version="$(curl ''${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} -sL "https://api.github.com/repos/RadeonOpenCompute/rocm_smi_lib/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
update-source-version rocm-smi "$version" --ignore-same-hash
'';

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

@ -3905,6 +3905,8 @@ with pkgs;
dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
dynamic-wallpaper = callPackage ../tools/graphics/dynamic-wallpaper { };
dyncall = callPackage ../development/libraries/dyncall { };
dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
@ -10725,6 +10727,8 @@ with pkgs;
pydeps = with python3Packages; toPythonApplication pydeps;
python-launcher = callPackage ../development/tools/misc/python-launcher { };
pytrainer = callPackage ../applications/misc/pytrainer { };
pywal = with python3Packages; toPythonApplication pywal;
@ -10938,7 +10942,7 @@ with pkgs;
reredirect = callPackage ../tools/misc/reredirect { };
retext = libsForQt5.callPackage ../applications/editors/retext { };
retext = qt6Packages.callPackage ../applications/editors/retext { };
inherit (callPackage ../tools/security/rekor { })
rekor-cli

6
pkgs/top-level/ocaml-packages.nix
View file

@ -648,8 +648,6 @@ let
js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { };
js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {};
js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {};
js_of_ocaml-lwt = callPackage ../development/tools/ocaml/js_of_ocaml/lwt.nix {};
@ -1557,10 +1555,6 @@ let
zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { };
ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving {
oasis = ocaml_oasis;
};
# Jane Street
janePackage =

1
pkgs/top-level/python-aliases.nix
View file

@ -60,6 +60,7 @@ mapAliases ({
django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18
django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
django_appconf = django-appconf; # added 2022-03-03
django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21
django_environ = django-environ; # added 2021-12-25
django_extensions = django-extensions; # added 2022-01-09
django_guardian = django-guardian; # added 2022-05-19

4
pkgs/top-level/python-packages.nix
View file

@ -702,6 +702,8 @@ self: super: with self; {
async-timeout = callPackage ../development/python-modules/async_timeout { };
asyncua = callPackage ../development/python-modules/asyncua { };
async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
asyncwhois = callPackage ../development/python-modules/asyncwhois { };
@ -2493,8 +2495,6 @@ self: super: with self; {
django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { };
django-discover-runner = callPackage ../development/python-modules/django-discover-runner { };
django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { };
django-encrypted-model-fields = callPackage ../development/python-modules/django-encrypted-model-fields { };