Merge master into haskell-updates
This commit is contained in:
commit
d24851067d
|
@ -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>
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -13,6 +13,12 @@ in {
|
|||
services.erigon = {
|
||||
enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier");
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = lib.mdDoc "Additional arguments passed to Erigon";
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
secretJwtPath = mkOption {
|
||||
type = types.path;
|
||||
description = lib.mdDoc ''
|
||||
|
@ -86,7 +92,7 @@ in {
|
|||
|
||||
serviceConfig = {
|
||||
LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}";
|
||||
ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT";
|
||||
ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}";
|
||||
DynamicUser = true;
|
||||
Restart = "on-failure";
|
||||
StateDirectory = "erigon";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
};
|
||||
|
|
|
@ -138,7 +138,8 @@ in
|
|||
StateDirectory = mkIf defaultStateDir "changedetection-io";
|
||||
StateDirectoryMode = mkIf defaultStateDir "0750";
|
||||
WorkingDirectory = cfg.datastorePath;
|
||||
Environment = lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
|
||||
Environment = [ "HIDE_REFERER=true" ]
|
||||
++ lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
|
||||
++ lib.optional cfg.behindProxy "USE_X_SETTINGS=1"
|
||||
++ lib.optional cfg.webDriverSupport "WEBDRIVER_URL=http://127.0.0.1:${toString cfg.chromePort}/wd/hub"
|
||||
++ lib.optional cfg.playwrightSupport "PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:${toString cfg.chromePort}/?stealth=1&--disable-web-security=true";
|
||||
|
|
|
@ -372,17 +372,19 @@ in {
|
|||
};
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "mastodon@example.com";
|
||||
description = lib.mdDoc "SMTP login name.";
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
passwordFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/var/lib/mastodon/secrets/smtp-password";
|
||||
description = lib.mdDoc ''
|
||||
Path to file containing the SMTP password.
|
||||
'';
|
||||
default = "/var/lib/mastodon/secrets/smtp-password";
|
||||
example = "/run/keys/mastodon-smtp-password";
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -467,6 +469,20 @@ in {
|
|||
assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user);
|
||||
message = ''For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user and services.mastodon.database.user must be identical.'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.smtp.authenticate -> (cfg.smtp.user != null);
|
||||
message = ''
|
||||
<option>services.mastodon.smtp.user</option> needs to be set if
|
||||
<option>services.mastodon.smtp.authenticate</option> is enabled.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.smtp.authenticate -> (cfg.smtp.passwordFile != null);
|
||||
message = ''
|
||||
<option>services.mastodon.smtp.passwordFile</option> needs to be set if
|
||||
<option>services.mastodon.smtp.authenticate</option> is enabled.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.mastodon-init-dirs = {
|
||||
|
|
|
@ -7,6 +7,9 @@ with lib;
|
|||
###### interface
|
||||
|
||||
options = {
|
||||
boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systemds like containers which do not require a kernel.") // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
boot.blacklistedKernelModules = mkOption {
|
||||
type = types.listOf types.str;
|
||||
|
@ -38,7 +41,7 @@ with lib;
|
|||
|
||||
###### implementation
|
||||
|
||||
config = mkIf (!config.boot.isContainer) {
|
||||
config = mkIf config.boot.modprobeConfig.enable {
|
||||
|
||||
environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||
|
||||
|
|
|
@ -8,7 +8,9 @@ with lib;
|
|||
|
||||
# Disable some features that are not useful in a container.
|
||||
|
||||
# containers don't have a kernel
|
||||
boot.kernel.enable = false;
|
||||
boot.modprobeConfig.enable = false;
|
||||
|
||||
console.enable = mkDefault false;
|
||||
|
||||
|
|
|
@ -28,8 +28,8 @@ let
|
|||
messagebus:x:1:
|
||||
EOF
|
||||
|
||||
"${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \
|
||||
--config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf"
|
||||
"${pkgs.dbus}/bin/dbus-daemon" --fork \
|
||||
--config-file="${pkgs.dbus}/share/dbus-1/system.conf"
|
||||
|
||||
${guestAdditions}/bin/VBoxService
|
||||
${(attrs.vmScript or (const "")) pkgs}
|
||||
|
|
|
@ -1,21 +1,19 @@
|
|||
{ lib, mkDerivation, fetchurl, cmake, pkg-config
|
||||
, qtbase, qttools, qtmultimedia, qtx11extras
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config
|
||||
, qtbase, qttools, qtmultimedia, wrapQtAppsHook
|
||||
# transports
|
||||
, curl, libmms
|
||||
# input plugins
|
||||
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
|
||||
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
|
||||
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi, libbs2b, game-music-emu
|
||||
# output plugins
|
||||
, alsa-lib, libpulseaudio
|
||||
, alsa-lib, libpulseaudio, pipewire
|
||||
# effect plugins
|
||||
, libsamplerate
|
||||
}:
|
||||
|
||||
# Additional plugins that can be added:
|
||||
# wavpack (https://www.wavpack.com/)
|
||||
# gme (Game music support)
|
||||
# Ogg Opus support
|
||||
# BS2B effect plugin (http://bs2b.sourceforge.net/)
|
||||
# JACK audio support
|
||||
# ProjectM visualization plugin
|
||||
|
||||
|
@ -28,26 +26,27 @@
|
|||
# Qmmp installs working .desktop file(s) all by itself, so we don't need to
|
||||
# handle that.
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmmp";
|
||||
version = "1.4.4";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ=";
|
||||
url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
buildInputs =
|
||||
[ # basic requirements
|
||||
qtbase qttools qtmultimedia qtx11extras
|
||||
qtbase qttools qtmultimedia
|
||||
# transports
|
||||
curl libmms
|
||||
# input plugins
|
||||
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
|
||||
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
|
||||
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libbs2b game-music-emu
|
||||
# output plugins
|
||||
alsa-lib libpulseaudio
|
||||
alsa-lib libpulseaudio pipewire
|
||||
# effect plugins
|
||||
libsamplerate
|
||||
];
|
||||
|
|
|
@ -119,7 +119,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
checkInputs = [
|
||||
dbus.daemon
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
glibcLocales
|
||||
hicolor-icon-theme
|
||||
|
@ -154,7 +154,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
runHook preCheck
|
||||
|
||||
xvfb-run -s '-screen 0 1920x1080x24' \
|
||||
dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \
|
||||
pytest $pytestFlags
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,19 +1,17 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, ncurses }:
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hexdino";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Luz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n8gizawx8h58hpyyqivp7vwy7yhn6scipl5rrbvkpnav8qpmk1r";
|
||||
sha256 = "sha256-OFtOa6StpOuLgkULnY5MlqDcSTEiMxogowHIBEiGr4E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "01869b1d7gbsprcxxj7h9z16pvnzb02j2hywh97gfq5x96gnmkz3";
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
cargoSha256 = "sha256-lvLiRQNH3rpu+JTXWhQtXczmGRWGtnnLDknZaMp3d0s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hex editor with vim like keybindings written in Rust";
|
||||
|
|
|
@ -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
28
pkgs/applications/editors/retext/remove-wheel-check.patch
Normal 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
|
|
@ -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
|
||||
|
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xournalpp";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xournalpp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E/7S4JGLXR8u9fE8bTVPFb6XVKOC/BHnQwLhr7N2A48=";
|
||||
sha256 = "sha256-Hn7IDnbrmK3V+iz8UqdmHRV2TS4MwYSgYtnH6igbGJ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -10,8 +10,12 @@
|
|||
, sassc
|
||||
, python3Packages
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, libappindicator-gtk3
|
||||
, libxcb
|
||||
, qt5
|
||||
, ibus
|
||||
, usbutils
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
@ -28,11 +32,9 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
|
||||
substituteInPlace scripts/build-styles.sh \
|
||||
--replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \
|
||||
--replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass'
|
||||
|
||||
substituteInPlace pylib/common.py \
|
||||
--replace "/usr/share/polychromatic" "$out/share/polychromatic"
|
||||
'';
|
||||
|
@ -40,7 +42,6 @@ python3Packages.buildPythonApplication rec {
|
|||
preConfigure = ''
|
||||
scripts/build-styles.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
gettext
|
||||
gobject-introspection
|
||||
|
@ -48,18 +49,22 @@ python3Packages.buildPythonApplication rec {
|
|||
ninja
|
||||
sassc
|
||||
wrapGAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
colorama
|
||||
colour
|
||||
gtk3
|
||||
openrazer
|
||||
pygobject3
|
||||
pyqt5
|
||||
pyqtwebengine
|
||||
requests
|
||||
setproctitle
|
||||
libxcb
|
||||
openrazer-daemon
|
||||
libappindicator-gtk3
|
||||
ibus
|
||||
usbutils
|
||||
];
|
||||
|
||||
dontWrapGapps = true;
|
||||
|
@ -67,6 +72,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
makeWrapperArgs = [
|
||||
"\${gappsWrapperArgs[@]}"
|
||||
"\${qtWrapperArgs[@]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, xorg
|
||||
}:
|
||||
|
@ -17,6 +18,15 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx";
|
||||
|
||||
patches = [
|
||||
# Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64
|
||||
# Remove with next version update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch";
|
||||
hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs=";
|
||||
})
|
||||
];
|
||||
|
||||
# The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
|
||||
postFixup = ''
|
||||
patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch
|
||||
|
@ -26,6 +36,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A lightweight application launcher for X11";
|
||||
homepage = "https://github.com/PonasKovas/rlaunch";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ danc86 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -45,7 +45,7 @@ assert with lib.strings; (
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "31.3.1";
|
||||
version = "31.4.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-oLtCS5Izdk2ImyzKx2IXkzv6pJp86mvP99P0+XIteRA=";
|
||||
sha256 = "sha256-x+o1Bb0HwtWsIhz1gI/s5a4qCdOrni7KsF0ZZAlJBzg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -19,7 +19,7 @@ ac_add_options --enable-jemalloc
|
|||
ac_add_options --enable-strip
|
||||
ac_add_options --enable-devtools
|
||||
ac_add_options --enable-av1
|
||||
ac_add_options --enable-phoenix-extensions
|
||||
ac_add_options --enable-jxl
|
||||
|
||||
ac_add_options --disable-eme
|
||||
ac_add_options --disable-webrtc
|
||||
|
|
|
@ -7,7 +7,7 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik=";
|
||||
sha256 = "sha256-J0D49VESNgdBEWAf01LkiiU2I01r4PBLyWKpnE9t45Q=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
|||
NO_AT_BRIDGE=1 \
|
||||
XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
# SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags.
|
||||
let rev = "551bf68c694927839c3add25a2512f880902ee9b";
|
||||
let rev = "5b97033257d0276c7b0d1b20412667a69d79261e";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "sonobuoy";
|
||||
version = "0.56.10"; # Do not forget to update `rev` above
|
||||
version = "0.56.12"; # Do not forget to update `rev` above
|
||||
|
||||
ldflags =
|
||||
let t = "github.com/vmware-tanzu/sonobuoy";
|
||||
|
@ -20,10 +20,10 @@ buildGoModule rec {
|
|||
owner = "vmware-tanzu";
|
||||
repo = "sonobuoy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hykm8h0kJzTL6XbaBe3vtoghmP4LmvPfBhrTgCmNyRE=";
|
||||
sha256 = "sha256-i+fg5tPkpnNl1Oef1KPmhHC+5t4y9vvfRpw9DHbsf4w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jBm3t/kvijAv5KOLhDJ1kGLdzpFJiBs/Vtu2mO2lnPM=";
|
||||
vendorSha256 = "sha256-SRR4TmNHbMOOMv6AXv/Qpn2KUQh+ZsFlzc5DpdyPLEU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, copyDesktopItems
|
||||
, electron_18
|
||||
, buildGoModule
|
||||
|
@ -8,9 +9,9 @@
|
|||
, libdeltachat
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, nodePackages
|
||||
, noto-fonts-emoji
|
||||
, pkg-config
|
||||
, python3
|
||||
, roboto
|
||||
, rustPlatform
|
||||
, sqlcipher
|
||||
|
@ -20,52 +21,48 @@
|
|||
|
||||
let
|
||||
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
|
||||
version = "1.86.0";
|
||||
version = "1.102.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0=";
|
||||
hash = "sha256-xw/lUNs39nkBrydpcgUBL3j6XrZFafKslxx6zUiElWw=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${old.pname}-${version}";
|
||||
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
|
||||
hash = "sha256-CiqYKFABHcFSjYUH/qop1xWCoygQJajI7nhv04ElD10=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "turn-off-hard-errors-for-lints.patch";
|
||||
url = "https://github.com/deltachat/deltachat-core-rust/commit/7598c50dbaa2abcbd417d96a02743269f666597b.patch";
|
||||
hash = "sha256-Xss44v6Wf6mL3FK9hH+oFYZ0fBA9rSh4wDrr7nSUibQ=";
|
||||
})
|
||||
];
|
||||
});
|
||||
esbuild' = esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.12.29";
|
||||
version = "0.14.54";
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg=";
|
||||
hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w=";
|
||||
};
|
||||
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
};
|
||||
in nodePackages.deltachat-desktop.override rec {
|
||||
in buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.30.1";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA=";
|
||||
hash = "sha256-M2ZLWaxVq9PvxJemwv+7jd0cXKQb6T5VCyLvIRF+9d0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-wCsPKEgRpPsNmM0HzvS5QjlPnw8COPrOhQRIf+vYeig=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
@ -81,20 +78,25 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
USE_SYSTEM_LIBDELTACHAT = "true";
|
||||
VERSION_INFO_GIT_REF = src.rev;
|
||||
|
||||
postRebuild = ''
|
||||
preBuild = ''
|
||||
rm -r node_modules/deltachat-node/node/prebuilds
|
||||
|
||||
npm run build4production
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
npmBuildScript = "build4production";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
npm prune --production
|
||||
|
||||
install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \
|
||||
$out/share/icons/hicolor/scalable/apps/deltachat.png
|
||||
mkdir -p $out/lib/node_modules/deltachat-desktop
|
||||
cp -r . $out/lib/node_modules/deltachat-desktop
|
||||
|
||||
awk '!/^#/ && NF' build/packageignore_list \
|
||||
| xargs -I {} sh -c "rm -rf {}" || true
|
||||
| xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true
|
||||
|
||||
install -D build/icon.png \
|
||||
$out/share/icons/hicolor/scalable/apps/deltachat.png
|
||||
|
||||
ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \
|
||||
$out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji
|
||||
|
@ -106,6 +108,8 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
|
||||
--add-flags $out/lib/node_modules/deltachat-desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = lib.singleton (makeDesktopItem {
|
||||
|
@ -117,7 +121,12 @@ in nodePackages.deltachat-desktop.override rec {
|
|||
comment = meta.description;
|
||||
categories = [ "Network" "InstantMessaging" "Chat" ];
|
||||
startupWMClass = "DeltaChat";
|
||||
mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ];
|
||||
mimeTypes = [
|
||||
"x-scheme-handler/openpgp4fpr"
|
||||
"x-scheme-handler/dcaccount"
|
||||
"x-scheme-handler/dclogin"
|
||||
"x-scheme-handler/mailto"
|
||||
];
|
||||
});
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
|
|
@ -1,56 +0,0 @@
|
|||
{
|
||||
"name": "deltachat-desktop",
|
||||
"version": "1.30.1",
|
||||
"dependencies": {
|
||||
"@blueprintjs/core": "^4.1.2",
|
||||
"@deltachat/message_parser_wasm": "^0.4.0",
|
||||
"@deltachat/react-qr-reader": "^4.0.0",
|
||||
"@mapbox/geojson-extent": "^1.0.0",
|
||||
"application-config": "^1.0.1",
|
||||
"classnames": "^2.3.1",
|
||||
"debounce": "^1.2.0",
|
||||
"deltachat-node": "1.86.0",
|
||||
"emoji-js-clean": "^4.0.0",
|
||||
"emoji-mart": "^3.0.1",
|
||||
"emoji-regex": "^9.2.2",
|
||||
"error-stack-parser": "^2.0.7",
|
||||
"filesize": "^8.0.6",
|
||||
"immutable": "^4.0.0",
|
||||
"mapbox-gl": "^1.12.0",
|
||||
"mime-types": "^2.1.31",
|
||||
"moment": "^2.29.2",
|
||||
"path-browserify": "^1.0.1",
|
||||
"rc": "^1.2.8",
|
||||
"react": "^17.0.2",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-string-replace": "^1.0.0",
|
||||
"react-virtualized-auto-sizer": "^1.0.5",
|
||||
"react-window": "^1.8.6",
|
||||
"react-window-infinite-loader": "^1.0.7",
|
||||
"react-zoom-pan-pinch": "^2.1.3",
|
||||
"source-map-support": "^0.5.19",
|
||||
"stackframe": "^1.2.1",
|
||||
"url-parse": "^1.5.9",
|
||||
"use-debounce": "^3.3.0",
|
||||
"@babel/core": "^7.7.7",
|
||||
"@babel/preset-env": "^7.7.7",
|
||||
"@babel/preset-react": "^7.7.4",
|
||||
"@types/debounce": "^1.2.0",
|
||||
"@types/emoji-mart": "^3.0.9",
|
||||
"@types/mapbox-gl": "^0.54.5",
|
||||
"@types/mime-types": "^2.1.0",
|
||||
"@types/node": "^14.14.20",
|
||||
"@types/rc": "^1.1.0",
|
||||
"@types/react": "^17.0.2",
|
||||
"@types/react-dom": "^17.0.2",
|
||||
"@types/react-window": "^1.8.4",
|
||||
"@types/react-window-infinite-loader": "^1.0.4",
|
||||
"@types/url-parse": "^1.4.3",
|
||||
"electron": "^18.0.3",
|
||||
"esbuild": "^0.12.29",
|
||||
"glob-watcher": "^5.0.5",
|
||||
"sass": "^1.26.5",
|
||||
"typescript": "^4.4.4",
|
||||
"xml-js": "^1.6.8"
|
||||
}
|
||||
}
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch
|
||||
#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps
|
||||
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
@ -28,18 +28,5 @@ tac default.nix \
|
|||
| sponge default.nix
|
||||
|
||||
src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link)
|
||||
|
||||
jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@types/node-fetch","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","node-fetch","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \
|
||||
"$src/package.json" > package.json.new
|
||||
|
||||
if cmp --quiet package.json{.new,}; then
|
||||
echo "package.json not changed, skip updating nodePackages"
|
||||
rm package.json.new
|
||||
else
|
||||
echo "package.json changed, updating nodePackages"
|
||||
mv package.json{.new,}
|
||||
|
||||
pushd ../../../../development/node-packages
|
||||
./generate.sh
|
||||
popd
|
||||
fi
|
||||
hash=$(prefetch-npm-deps $src/package-lock.json)
|
||||
sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix
|
||||
|
|
|
@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
|
||||
++ extraPythonPackages python3.pkgs;
|
||||
|
||||
checkInputs = [ xvfb-run dbus.daemon ];
|
||||
checkInputs = [ xvfb-run dbus ];
|
||||
|
||||
checkPhase = ''
|
||||
xvfb-run dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
${python3.interpreter} -m unittest discover -s test/gtk -v
|
||||
${python3.interpreter} -m unittest discover -s test/no_gui -v
|
||||
'';
|
||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config libxslt python3 ];
|
||||
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ];
|
||||
|
||||
checkInputs = [ dbus.daemon ];
|
||||
checkInputs = [ dbus ];
|
||||
|
||||
configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ python3Packages.buildPythonApplication rec {
|
|||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ dbus.daemon ];
|
||||
checkInputs = [ dbus ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
|
@ -114,7 +114,7 @@ python3Packages.buildPythonApplication rec {
|
|||
# only need to run a virtual X server + dbus but also have a large enough
|
||||
# resolution, because the Cairo test tries to draw a 200x200 window.
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
$out/bin/paperwork-gtk chkdeps
|
||||
|
||||
# content of make test, without the dep on make install
|
||||
|
|
|
@ -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" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
|
|||
libdatrie
|
||||
libxkbcommon
|
||||
libepoxy
|
||||
dbus.daemon
|
||||
dbus
|
||||
at-spi2-core
|
||||
libXtst
|
||||
];
|
||||
|
|
|
@ -1,42 +1,44 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, rapidjson, spdlog, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, eigen, rapidjson, spdlog, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vowpal-wabbit";
|
||||
version = "9.0.1";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VowpalWabbit";
|
||||
repo = "vowpal_wabbit";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZUurY2bmTKKIW4GR4oiIpLxb6DSRUNJI/EyNSOu9D9c=";
|
||||
sha256 = "sha256-iSsxpeTRZjIhZaYBeoKLHl9j1aBIXWjONmAInmKvU/I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix x86_64-linux build by adding missing include
|
||||
# https://github.com/VowpalWabbit/vowpal_wabbit/pull/4275
|
||||
(fetchpatch {
|
||||
url = "https://github.com/VowpalWabbit/vowpal_wabbit/commit/0cb410dfc885ca1ecafd1f8a962b481574fb3b82.patch";
|
||||
sha256 = "sha256-bX3eJ+vMTEMAo3EiESQTDryBP0h2GtnMa/Fz0rTeaNY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
flatbuffers
|
||||
eigen
|
||||
rapidjson
|
||||
spdlog
|
||||
zlib
|
||||
];
|
||||
|
||||
# -DBUILD_TESTS=OFF is set as both it saves time in the build and the default
|
||||
# cmake flags appended by the builder include -DBUILD_TESTING=OFF for which
|
||||
# this is the equivalent flag.
|
||||
# Flatbuffers are an optional feature.
|
||||
# BUILD_FLATBUFFERS=ON turns it on. This will still consume Flatbuffers as a
|
||||
# system dependency
|
||||
cmakeFlags = [
|
||||
"-DVW_INSTALL=ON"
|
||||
"-DBUILD_TESTS=OFF"
|
||||
"-DBUILD_JAVA=OFF"
|
||||
"-DBUILD_PYTHON=OFF"
|
||||
"-DUSE_LATEST_STD=ON"
|
||||
"-DRAPIDJSON_SYS_DEP=ON"
|
||||
"-DFMT_SYS_DEP=ON"
|
||||
"-DSPDLOG_SYS_DEP=ON"
|
||||
"-DBUILD_FLATBUFFERS=ON"
|
||||
"-DVW_BOOST_MATH_SYS_DEP=ON"
|
||||
"-DVW_EIGEN_SYS_DEP=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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; {
|
||||
|
|
|
@ -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):
|
|
@ -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
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-delete-merged-branches";
|
||||
version = "7.2.0";
|
||||
version = "7.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hartwork";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-pdP+DDJOSqr/fUQPtb84l/8J4EA81nlk/U8h24X8n+I=";
|
||||
sha256 = "sha256-Q83s0kkrArRndxQa+V+eZw+iaJje7VR+aPScB33l1W0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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" ];
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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'
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -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)
|
|
@ -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))
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3 }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3, nix-update-script }:
|
||||
|
||||
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }`
|
||||
stdenvNoCC.mkDerivation {
|
||||
|
@ -41,7 +41,10 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
passthru = {
|
||||
scriptName = "sponsorblock.lua";
|
||||
updateScript = ./update-sponsorblock.sh;
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "mpvScripts.sponsorblock";
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts git jq nix nix-prefetch-git
|
||||
git_url='https://github.com/po5/mpv_sponsorblock.git'
|
||||
git_branch='master'
|
||||
git_dir='/var/tmp/mpv_sponsorblock.git'
|
||||
nix_file="$(dirname "${BASH_SOURCE[0]}")/sponsorblock.nix"
|
||||
pkg='mpvScripts.sponsorblock'
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
info() {
|
||||
if [ -t 2 ]; then
|
||||
set -- '\033[32m%s\033[39m\n' "$@"
|
||||
else
|
||||
set -- '%s\n' "$@"
|
||||
fi
|
||||
printf "$@" >&2
|
||||
}
|
||||
|
||||
old_rev=$(nix-instantiate --eval --strict --json -A "$pkg.src.rev" | jq -r)
|
||||
old_version=$(nix-instantiate --eval --strict --json -A "$pkg.version" | jq -r)
|
||||
today=$(LANG=C date -u +'%Y-%m-%d')
|
||||
|
||||
info "fetching $git_url..."
|
||||
if [ ! -d "$git_dir" ]; then
|
||||
git init --initial-branch="$git_branch" "$git_dir"
|
||||
git -C "$git_dir" remote add origin "$git_url"
|
||||
fi
|
||||
git -C "$git_dir" fetch origin "$git_branch"
|
||||
|
||||
# use latest commit before today, we should not call the version *today*
|
||||
# because there might still be commits coming
|
||||
# use the day of the latest commit we picked as version
|
||||
new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch")
|
||||
new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")"
|
||||
info "latest commit before $today: $new_rev"
|
||||
|
||||
if [ "$new_rev" = "$old_rev" ]; then
|
||||
info "$pkg is up-to-date."
|
||||
exit
|
||||
fi
|
||||
|
||||
new_sha256=$(nix-prefetch-git --rev "$new_rev" "$git_dir" | jq -r .sha256)
|
||||
update-source-version "$pkg" \
|
||||
"$new_version" \
|
||||
"$new_sha256" \
|
||||
--rev="$new_rev"
|
||||
git add "$nix_file"
|
||||
git commit --verbose --message "$pkg: $old_version -> $new_version"
|
|
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
autoPatchelfHook
|
||||
cairo
|
||||
cups.lib
|
||||
dbus.daemon.lib
|
||||
dbus.lib
|
||||
expat
|
||||
gcc-unwrapped
|
||||
gdk-pixbuf
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{ lib, callPackage, fetchFromGitHub }:
|
||||
|
||||
with lib;
|
||||
|
||||
rec {
|
||||
dockerGen = {
|
||||
version, rev, sha256
|
||||
|
@ -13,11 +11,14 @@ rec {
|
|||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose
|
||||
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs
|
||||
, nixosTests
|
||||
, sqlite, iproute2, docker-buildx, docker-compose
|
||||
, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests
|
||||
, clientOnly ? !stdenv.isLinux, symlinkJoin
|
||||
, withSystemd ? true, systemd
|
||||
, withBtrfs ? true, btrfs-progs
|
||||
, withLvm ? true, lvm2
|
||||
, withSeccomp ? true, libseccomp
|
||||
}:
|
||||
let
|
||||
docker-runc = runc.overrideAttrs (oldAttrs: {
|
||||
|
@ -46,7 +47,8 @@ rec {
|
|||
sha256 = containerdSha256;
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [ libseccomp ];
|
||||
buildInputs = oldAttrs.buildInputs
|
||||
++ lib.optional withSeccomp [ libseccomp ];
|
||||
});
|
||||
|
||||
docker-tini = tini.overrideAttrs (oldAttrs: {
|
||||
|
@ -68,7 +70,7 @@ rec {
|
|||
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
|
||||
});
|
||||
|
||||
moby = buildGoPackage (optionalAttrs stdenv.isLinux rec {
|
||||
moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec {
|
||||
pname = "moby";
|
||||
inherit version;
|
||||
|
||||
|
@ -77,11 +79,15 @@ rec {
|
|||
goPackagePath = "github.com/docker/docker";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ];
|
||||
buildInputs = [ sqlite lvm2 btrfs-progs systemd libseccomp ];
|
||||
buildInputs = [ sqlite ]
|
||||
++ lib.optional withLvm lvm2
|
||||
++ lib.optional withBtrfs btrfs-progs
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optional withSeccomp libseccomp;
|
||||
|
||||
extraPath = optionals stdenv.isLinux (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
|
||||
extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
|
||||
|
||||
extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
|
||||
extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
|
||||
|
||||
patches = [
|
||||
# This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
|
||||
|
@ -132,15 +138,21 @@ rec {
|
|||
--prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath"
|
||||
'';
|
||||
|
||||
DOCKER_BUILDTAGS = [ "journald" "seccomp" ];
|
||||
DOCKER_BUILDTAGS = lib.optional withSystemd "journald"
|
||||
++ lib.optional withBtrfs "exclude_graphdriver_btrfs"
|
||||
++ lib.optional withLvm "exclude_graphdriver_devicemapper"
|
||||
++ lib.optional withSeccomp "seccomp";
|
||||
});
|
||||
|
||||
plugins = optionals buildxSupport [ docker-buildx ]
|
||||
++ optionals composeSupport [ docker-compose ];
|
||||
plugins = lib.optional buildxSupport docker-buildx
|
||||
++ lib.optional composeSupport docker-compose;
|
||||
pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; };
|
||||
in
|
||||
buildGoPackage (optionalAttrs (!clientOnly) {
|
||||
} // rec {
|
||||
buildGoPackage (lib.optionalAttrs (!clientOnly) {
|
||||
# allow overrides of docker components
|
||||
# TODO: move packages out of the let...in into top-level to allow proper overrides
|
||||
inherit docker-runc docker-containerd docker-proxy docker-tini moby;
|
||||
} // rec {
|
||||
pname = "docker";
|
||||
inherit version;
|
||||
|
||||
|
@ -156,14 +168,17 @@ rec {
|
|||
nativeBuildInputs = [
|
||||
makeWrapper pkg-config go-md2man go libtool installShellFiles
|
||||
];
|
||||
buildInputs = optionals (!clientOnly) [
|
||||
sqlite lvm2 btrfs-progs systemd libseccomp
|
||||
] ++ plugins;
|
||||
buildInputs = lib.optional (!clientOnly) sqlite
|
||||
++ lib.optional withLvm lvm2
|
||||
++ lib.optional withBtrfs btrfs-progs
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optional withSeccomp libseccomp
|
||||
++ plugins;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs man scripts/build/
|
||||
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
|
||||
'' + optionalString (plugins != []) ''
|
||||
'' + lib.optionalString (plugins != []) ''
|
||||
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
|
||||
"${pluginsRef}/libexec/docker/cli-plugins"
|
||||
'';
|
||||
|
@ -194,7 +209,7 @@ rec {
|
|||
|
||||
makeWrapper $out/libexec/docker/docker $out/bin/docker \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath"
|
||||
'' + optionalString (!clientOnly) ''
|
||||
'' + lib.optionalString (!clientOnly) ''
|
||||
# symlink docker daemon to docker cli derivation
|
||||
ln -s ${moby}/bin/dockerd $out/bin/dockerd
|
||||
ln -s ${moby}/bin/dockerd-rootless $out/bin/dockerd-rootless
|
||||
|
@ -222,17 +237,18 @@ rec {
|
|||
installManPage man/*/*.[1-9]
|
||||
'';
|
||||
|
||||
passthru.tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };
|
||||
passthru = {
|
||||
# Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
|
||||
inherit moby-src;
|
||||
tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.docker.com/";
|
||||
description = "An open source project to pack, ship and run any application as a lightweight container";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ];
|
||||
};
|
||||
|
||||
# Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
|
||||
inherit moby-src;
|
||||
});
|
||||
|
||||
# Get revisions from
|
||||
|
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "e16";
|
||||
version = "1.0.26";
|
||||
version = "1.0.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
|
||||
hash = "sha256-1FJFE4z8UT5VYv0Ef9pqi5sYq8iIbrDPKaqcUFf9dwE=";
|
||||
hash = "sha256-Lr5OC14N6KTZNU3Ei4O9taYGL+1NZd5JmejYBmmELUE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preCheck
|
||||
export NO_AT_BRIDGE=1
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
runHook postCheck
|
||||
'';
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
{ nix-update }:
|
||||
|
||||
{ attrPath }:
|
||||
{ attrPath
|
||||
, extraArgs ? []
|
||||
}:
|
||||
|
||||
[ "${nix-update}/bin/nix-update" attrPath ]
|
||||
[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ [ attrPath ]
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.044";
|
||||
version = "0.046";
|
||||
|
||||
in
|
||||
fetchzip {
|
||||
name = "JuliaMono-ttf-${version}";
|
||||
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz";
|
||||
sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg=";
|
||||
sha256 = "sha256-+Ro517m1unQskQFhsT6oiz19aov87/tT1jlP/XB7kFU=";
|
||||
|
||||
stripRoot = false;
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
tar xf $downloadedFile -C $out/share/fonts/truetype
|
||||
mv $out/*.ttf $out/share/fonts/truetype
|
||||
rm $out/LICENSE
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export HOME=$(mktemp -d)
|
||||
dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
make check
|
||||
'';
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
|
|||
HOME=$TMPDIR \
|
||||
XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test -v --no-stdsplit
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
@ -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")"
|
||||
|
|
|
@ -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")"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -269,6 +269,9 @@ package-maintainers:
|
|||
- wstunnel
|
||||
gridaphobe:
|
||||
- located-base
|
||||
ivanbrennan:
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
jb55:
|
||||
# - bson-lens
|
||||
- cased
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
checkPhase = ''
|
||||
export NO_AT_BRIDGE=1
|
||||
${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
dbus-launch = "${dbus.lib}/bin/dbus-launch";
|
||||
daemon = dbus.out;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -257,7 +257,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
export XDG_RUNTIME_HOME="$TMP"
|
||||
export HOME="$TMP"
|
||||
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
|
||||
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
|
||||
export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"
|
||||
export PATH="$PATH:$(pwd)/gobject"
|
||||
echo "PATH=$PATH"
|
||||
'';
|
||||
|
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
NO_AT_BRIDGE=1 \
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
make check
|
||||
'';
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --no-rebuild --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --no-rebuild --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -1,17 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl
|
||||
, x11Support ? false, libX11 ? null, cairo ? null
|
||||
, x11Support ? false, libX11, cairo
|
||||
}:
|
||||
|
||||
assert x11Support -> libX11 != null && cairo != null;
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hwloc";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
|
||||
url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
|
||||
sha256 = "sha256-NIpy/NSMMqgj7h2hSa6ZIgPnrQM1SeZK7W6m7rAfQsE=";
|
||||
};
|
||||
|
||||
|
@ -23,32 +19,26 @@ stdenv.mkDerivation rec {
|
|||
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# Filter out `null' inputs. This allows users to `.override' the
|
||||
# derivation and set optional dependencies to `null'.
|
||||
buildInputs = lib.filter (x: x != null)
|
||||
([ expat ncurses ]
|
||||
++ (optionals x11Support [ cairo libX11 ])
|
||||
++ (optionals stdenv.isLinux [ numactl ]));
|
||||
buildInputs = [ expat ncurses ]
|
||||
++ lib.optionals x11Support [ cairo libX11 ]
|
||||
++ lib.optionals stdenv.isLinux [ numactl ];
|
||||
|
||||
propagatedBuildInputs =
|
||||
# Since `libpci' appears in `hwloc.pc', it must be propagated.
|
||||
optional stdenv.isLinux pciutils;
|
||||
# Since `libpci' appears in `hwloc.pc', it must be propagated.
|
||||
propagatedBuildInputs = lib.optional stdenv.isLinux pciutils;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall =
|
||||
optionalString (stdenv.isLinux && numactl != null)
|
||||
'' if [ -d "${numactl}/lib64" ]
|
||||
then
|
||||
numalibdir="${numactl}/lib64"
|
||||
else
|
||||
numalibdir="${numactl}/lib"
|
||||
test -d "$numalibdir"
|
||||
fi
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
if [ -d "${numactl}/lib64" ]; then
|
||||
numalibdir="${numactl}/lib64"
|
||||
else
|
||||
numalibdir="${numactl}/lib"
|
||||
test -d "$numalibdir"
|
||||
fi
|
||||
|
||||
sed -i "$lib/lib/libhwloc.la" \
|
||||
-e "s|-lnuma|-L$numalibdir -lnuma|g"
|
||||
'';
|
||||
sed -i "$lib/lib/libhwloc.la" \
|
||||
-e "s|-lnuma|-L$numalibdir -lnuma|g"
|
||||
'';
|
||||
|
||||
# Checks disabled because they're impure (hardware dependent) and
|
||||
# fail on some build machines.
|
||||
|
@ -56,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Portable abstraction of hierarchical architectures for high-performance computing";
|
||||
longDescription = ''
|
||||
hwloc provides a portable abstraction (across OS,
|
||||
|
@ -73,7 +63,6 @@ stdenv.mkDerivation rec {
|
|||
gather information about the hardware, bind processes, and much
|
||||
more.
|
||||
'';
|
||||
|
||||
# https://www.open-mpi.org/projects/hwloc/license.php
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://www.open-mpi.org/projects/hwloc/";
|
||||
|
|
|
@ -2,21 +2,28 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
# for passthru.tests
|
||||
, intel-compute-runtime
|
||||
, intel-media-driver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.3.0";
|
||||
version = "22.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-ZJQ4KLKWA9SIXqKffU/uxUU+aXgfDdxQ5Wejgcfowgs=";
|
||||
sha256 = "sha256-bk1yBxMrPkFnPcV5uvEmbf3X2WG6iJNbD1WNxoOSnA8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit intel-compute-runtime intel-media-driver;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/intel/gmmlib";
|
||||
license = licenses.mit;
|
||||
|
|
|
@ -1,19 +1,46 @@
|
|||
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
index 66fab63de..a2cdf79d7 100644
|
||||
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
@@ -2195,8 +2195,8 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
diff --git a/media_driver/linux/common/ddi/media_libva_util.cpp b/media_driver/linux/common/ddi/media_libva_util.cpp
|
||||
index 25b4cb0b5..49254c2f0 100755
|
||||
--- a/media_driver/linux/common/ddi/media_libva_util.cpp
|
||||
+++ b/media_driver/linux/common/ddi/media_libva_util.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <dlfcn.h>
|
||||
#include <errno.h>
|
||||
+#include "inttypes.h"
|
||||
|
||||
int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
|
||||
float fps = m_frameCountFps / (diff / 1000000.0);
|
||||
- DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
#include "media_libva_util.h"
|
||||
#include "mos_utilities.h"
|
||||
@@ -91,7 +92,7 @@ void DdiMediaUtil_MediaPrintFps()
|
||||
int64_t diff = (tv2.tv_sec - tv1.tv_sec)*1000000 + tv2.tv_usec - tv1.tv_usec;
|
||||
float fps = frameCountFps / (diff / 1000000.0);
|
||||
DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%11llu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
|
||||
MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
|
||||
sprintf(fpsFileName, FPS_FILE_NAME);
|
||||
@@ -2213,4 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
index 66fab63de..38b1fae28 100644
|
||||
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
//! \brief libva util next implementaion.
|
||||
//!
|
||||
#include <sys/time.h>
|
||||
+#include "inttypes.h"
|
||||
#include "media_libva_util_next.h"
|
||||
#include "mos_utilities.h"
|
||||
#include "mos_os.h"
|
||||
@@ -2196,7 +2197,7 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
|
||||
float fps = m_frameCountFps / (diff / 1000000.0);
|
||||
DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
+ sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
|
||||
|
||||
MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
|
||||
sprintf(fpsFileName, FPS_FILE_NAME);
|
||||
@@ -2213,4 +2214,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
|
||||
pthread_mutex_unlock(&m_fpsMutex);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -33,9 +33,8 @@ stdenv.mkDerivation rec {
|
|||
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
|
||||
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
|
||||
})
|
||||
] ++ lib.optional stdenv.is32bit [
|
||||
# fix compilation on i686-linux but also breaks x86_64
|
||||
# a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me
|
||||
# fix compilation on 32bit
|
||||
# https://github.com/intel/media-driver/pull/1557
|
||||
./32bit.patch
|
||||
];
|
||||
|
||||
|
@ -73,6 +72,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}";
|
||||
license = with licenses; [ bsd3 mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,17 +2,15 @@
|
|||
|
||||
{ stdenv, fetchgit, lib
|
||||
, pkg-config, autoreconfHook
|
||||
, glib, dbus-glib, gtkVersion ? "3"
|
||||
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
|
||||
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
|
||||
, glib, dbus-glib
|
||||
, gtkVersion ? "3"
|
||||
, gtk2, libindicator-gtk2, libdbusmenu-gtk2
|
||||
, gtk3, libindicator-gtk3, libdbusmenu-gtk3
|
||||
, gtk-doc, vala, gobject-introspection
|
||||
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
|
||||
, monoSupport ? false, mono, gtk-sharp-2_0
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
|
||||
in "libappindicator-${postfix}";
|
||||
version = "12.10.1+20.10.20200706.1";
|
||||
|
@ -35,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
glib dbus-glib
|
||||
] ++ (if gtkVersion == "2"
|
||||
then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
|
||||
then [ libindicator-gtk2 ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]
|
||||
else [ libindicator-gtk3 ]);
|
||||
|
||||
preAutoreconf = ''
|
||||
|
@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
"localstatedir=\${TMPDIR}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A library to allow applications to export a menu into the Unity Menu bar";
|
||||
homepage = "https://launchpad.net/libappindicator";
|
||||
license = with licenses; [ lgpl21 lgpl3 ];
|
||||
|
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
checkPhase = ''
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
, pkg-config, intltool
|
||||
, glib, dbus-glib, json-glib
|
||||
, gobject-introspection, vala
|
||||
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
|
||||
|
||||
with lib;
|
||||
, gtkVersion ? null, gtk2, gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}";
|
||||
|
@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib dbus-glib json-glib
|
||||
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
|
||||
] ++ lib.optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
|
||||
|
||||
postPatch = ''
|
||||
for f in {configure,ltmain.sh,m4/libtool.m4}; do
|
||||
|
@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
"--localstatedir=/var"
|
||||
(if gtkVersion == null then "--disable-gtk" else "--with-gtk=${gtkVersion}")
|
||||
"--disable-scrollkeeper"
|
||||
] ++ optional (gtkVersion != "2") "--disable-dumper";
|
||||
] ++ lib.optional (gtkVersion != "2") "--disable-dumper";
|
||||
|
||||
doCheck = false; # generates shebangs in check phase, too lazy to fix
|
||||
|
||||
|
@ -50,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
"typelibdir=${placeholder "out"}/lib/girepository-1.0"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Library for passing menu structures across DBus";
|
||||
homepage = "https://launchpad.net/dbusmenu";
|
||||
license = with licenses; [ gpl3 lgpl21 lgpl3 ];
|
||||
|
|
|
@ -35,13 +35,12 @@
|
|||
, perlPackages
|
||||
, ocamlPackages
|
||||
, libtirpc
|
||||
, appliance ? null
|
||||
, withAppliance ? true
|
||||
, appliance
|
||||
, javaSupport ? false
|
||||
, jdk
|
||||
}:
|
||||
|
||||
assert appliance == null || lib.isDerivation appliance;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libguestfs";
|
||||
version = "1.48.4";
|
||||
|
@ -128,13 +127,13 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (appliance != null) ''
|
||||
postFixup = lib.optionalString withAppliance ''
|
||||
mkdir -p $out/{lib,lib64}
|
||||
ln -s ${appliance} $out/lib64/guestfs
|
||||
ln -s ${appliance} $out/lib/guestfs
|
||||
'';
|
||||
|
||||
doInstallCheck = appliance != null;
|
||||
doInstallCheck = withAppliance;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
|
@ -161,6 +160,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ offline ];
|
||||
platforms = platforms.linux;
|
||||
# this is to avoid "output size exceeded"
|
||||
hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux;
|
||||
hydraPlatforms = if withAppliance then appliance.meta.hydraPlatforms else platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
NO_AT_BRIDGE=1 \
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
{ stdenv, fetchurl, lib, file
|
||||
, pkg-config
|
||||
, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
|
||||
|
||||
with lib;
|
||||
, gtkVersion ? "3", gtk2, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libindicator-gtk${gtkVersion}";
|
||||
|
@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = false; # fails 8 out of 8 tests
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A set of symbols and convenience functions for Ayatana indicators";
|
||||
homepage = "https://launchpad.net/libindicator";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preCheck
|
||||
|
||||
dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
--config-file=${dbus}/share/dbus-1/session.conf \
|
||||
meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
|
|
|
@ -3,7 +3,13 @@
|
|||
, minimal ? false, libva-minimal
|
||||
, libX11, libXext, libXfixes, wayland, libffi, libGL
|
||||
, mesa
|
||||
# for passthru.tests
|
||||
, intel-compute-runtime
|
||||
, intel-media-driver
|
||||
, ffmpeg
|
||||
, mpv
|
||||
, vaapiIntel
|
||||
, vlc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -31,7 +37,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit intel-media-driver;
|
||||
# other drivers depending on libva and selected application users.
|
||||
# Please get a confirmation from the maintainer before adding more applications.
|
||||
inherit intel-compute-runtime intel-media-driver vaapiIntel mpv vlc;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -230,7 +230,7 @@ diff --git a/src/network/meson.build b/src/network/meson.build
|
|||
index b5eff0c3ab..a0f26d624e 100644
|
||||
--- a/src/network/meson.build
|
||||
+++ b/src/network/meson.build
|
||||
@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK')
|
||||
@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'),
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
|
@ -247,7 +247,7 @@ index b5eff0c3ab..a0f26d624e 100644
|
|||
]
|
||||
|
||||
configure_file(
|
||||
@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK')
|
||||
@@ -85,12 +85,12 @@ input: 'default.xml.in',
|
||||
output: '@BASENAME@',
|
||||
copy: true,
|
||||
install: true,
|
||||
|
@ -256,7 +256,7 @@ index b5eff0c3ab..a0f26d624e 100644
|
|||
)
|
||||
|
||||
meson.add_install_script(
|
||||
meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),
|
||||
meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(),
|
||||
- confdir / 'qemu' / 'networks' / 'autostart',
|
||||
+ install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
|
||||
'../default.xml', 'default.xml',
|
||||
|
|
|
@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
|
|||
# NOTE: You must also bump:
|
||||
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
|
||||
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
version = "8.8.0";
|
||||
version = "8.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p7z+paiSeIm2cWnc6n9Hrd++BDmccGj+EOhqHNsJiXw=";
|
||||
sha256 = "sha256-79frEYItbf1weOkrcyI/Z/TjTg6kLMQbteaTi9LAt0g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue