Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
615351069b
|
|
@ -58,7 +58,7 @@ with a nix-shell that has `numpy` and `toolz` in Python 3.9; then we will create
|
|||
a re-usable environment in a single-file Python script; then we will create a
|
||||
full Python environment for development with this same environment.
|
||||
|
||||
Philosphically, this should be familiar to users who are used to a `venv` style
|
||||
Philosophically, this should be familiar to users who are used to a `venv` style
|
||||
of development: individual projects create their own Python environments without
|
||||
impacting the global environment or each other.
|
||||
|
||||
|
|
|
|||
|
|
@ -11511,6 +11511,12 @@
|
|||
githubId = 3737;
|
||||
name = "Peter Jones";
|
||||
};
|
||||
phip1611 = {
|
||||
email = "phip1611@gmail.com";
|
||||
github = "phip1611";
|
||||
githubId = 5737016;
|
||||
name = "Philipp Schuster";
|
||||
};
|
||||
pkharvey = {
|
||||
email = "kayharvey@protonmail.com";
|
||||
github = "pkharvey";
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ let
|
|||
if (builtins.tryEval attrs.drvPath).success
|
||||
then { inherit (attrs) name drvPath; }
|
||||
else { failed = true; }
|
||||
else if attrs == null then {}
|
||||
else { recurseForDerivations = true; } //
|
||||
mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs
|
||||
else { };
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ in
|
|||
etc = {
|
||||
"hqplayer/hqplayerd.xml" = mkIf (cfg.config != null) { source = pkgs.writeText "hqplayerd.xml" cfg.config; };
|
||||
"hqplayer/hqplayerd4-key.xml" = mkIf (cfg.licenseFile != null) { source = cfg.licenseFile; };
|
||||
"modules-load.d/taudio2.conf".source = "${pkg}/etc/modules-load.d/taudio2.conf";
|
||||
};
|
||||
systemPackages = [ pkg ];
|
||||
};
|
||||
|
|
@ -91,8 +90,6 @@ in
|
|||
allowedTCPPorts = [ 8088 4321 ];
|
||||
};
|
||||
|
||||
services.udev.packages = [ pkg ];
|
||||
|
||||
systemd = {
|
||||
tmpfiles.rules = [
|
||||
"d ${configDir} 0755 hqplayer hqplayer - -"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
systemd.packages = [ pkgs.throttled ];
|
||||
# The upstream package has this in Install, but that's not enough, see the NixOS manual
|
||||
systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ];
|
||||
systemd.services.throttled.wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment.etc."throttled.conf".source =
|
||||
if cfg.extraConfig != ""
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ let
|
|||
"rspamd"
|
||||
"rtl_433"
|
||||
"script"
|
||||
"shelly"
|
||||
"snmp"
|
||||
"smartctl"
|
||||
"smokeping"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.shelly;
|
||||
in
|
||||
{
|
||||
port = 9784;
|
||||
extraOpts = {
|
||||
metrics-file = mkOption {
|
||||
type = types.path;
|
||||
description = lib.mdDoc ''
|
||||
Path to the JSON file with the metric definitions
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-shelly-exporter}/bin/shelly_exporter \
|
||||
-metrics-file ${cfg.metrics-file} \
|
||||
-listen-address ${cfg.listenAddress}:${toString cfg.port}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -275,6 +275,7 @@ in
|
|||
BusName = "org.freedesktop.Avahi";
|
||||
Type = "dbus";
|
||||
ExecStart = "${pkgs.avahi}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}";
|
||||
ConfigurationDirectory = "avahi/services";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@ in {
|
|||
options = {
|
||||
mount = lib.mkOption {
|
||||
description = lib.mdDoc "Where to mount this dataset.";
|
||||
type = types.nullOr types.string;
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
};
|
||||
|
||||
properties = lib.mkOption {
|
||||
description = lib.mdDoc "Properties to set on this dataset.";
|
||||
type = types.attrsOf types.string;
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ in
|
|||
options = {
|
||||
mount = lib.mkOption {
|
||||
description = lib.mdDoc "Where to mount this dataset.";
|
||||
type = types.nullOr types.string;
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
};
|
||||
|
||||
properties = lib.mkOption {
|
||||
description = lib.mdDoc "Properties to set on this dataset.";
|
||||
type = types.attrsOf types.string;
|
||||
type = types.attrsOf types.str;
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
with subtest("Enable case sensitivity and normalization sensitivity"):
|
||||
machine.succeed(
|
||||
"mkapfs -s -z /dev/vdb",
|
||||
# Triggers a bug, see https://github.com/linux-apfs/linux-apfs-rw/issues/15
|
||||
# "mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
|
||||
"mount -o readwrite /dev/vdb /tmp/mnt",
|
||||
"mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
|
||||
"echo 'Hello World 1' > /tmp/mnt/test.txt",
|
||||
"[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity
|
||||
"echo 'Hello World 1' | diff - /tmp/mnt/test.txt",
|
||||
|
|
@ -36,13 +34,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
with subtest("Disable case sensitivity and normalization sensitivity"):
|
||||
machine.succeed(
|
||||
"mkapfs /dev/vdb",
|
||||
"mount -o readwrite /dev/vdb /tmp/mnt",
|
||||
"mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
|
||||
"echo 'bla bla bla' > /tmp/mnt/Test.txt",
|
||||
"echo -n 'Hello World' > /tmp/mnt/test.txt",
|
||||
"echo ' 1' >> /tmp/mnt/TEST.TXT",
|
||||
"umount /tmp/mnt",
|
||||
"apfsck /dev/vdb",
|
||||
"mount -o readwrite /dev/vdb /tmp/mnt",
|
||||
"mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
|
||||
"echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity
|
||||
"echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt",
|
||||
"echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt",
|
||||
|
|
|
|||
|
|
@ -1060,6 +1060,20 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
shelly = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
metrics-file = "${pkgs.writeText "test.json" ''{}''}";
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-shelly-exporter.service")
|
||||
wait_for_open_port(9784)
|
||||
wait_until_succeeds(
|
||||
"curl -sSf 'localhost:9784/metrics'"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
script = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, makeWrapper, jre }:
|
||||
{ stdenv, lib, fetchurl, makeWrapper, jre_headless }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "JMusicBot";
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/lib
|
||||
cp $src $out/lib/JMusicBot
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/JMusicBot \
|
||||
makeWrapper ${jre_headless}/bin/java $out/bin/JMusicBot \
|
||||
--add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot"
|
||||
'';
|
||||
|
||||
|
|
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
platforms = platforms.all;
|
||||
inherit (jre_headless.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lsp-plugins";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
|
||||
sha256 = "sha256-GTrcUy10bN9Xj2I7uuGyP82c6NVpnQbXTI85H231yyo=";
|
||||
sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config php makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, gnutls
|
||||
, lame
|
||||
, libev
|
||||
, libgme
|
||||
, game-music-emu
|
||||
, libmicrohttpd
|
||||
, libopenmpt
|
||||
, mpg123
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
gnutls
|
||||
lame
|
||||
libev
|
||||
libgme
|
||||
game-music-emu
|
||||
libmicrohttpd
|
||||
libopenmpt
|
||||
mpg123
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osdlyrics";
|
||||
version = "0.5.12";
|
||||
version = "0.5.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osdlyrics";
|
||||
repo = "osdlyrics";
|
||||
rev = version;
|
||||
sha256 = "sha256-QGgwxmurdwo0xyq7p+1xditRebv64ewGTvNJI7MUnq4=";
|
||||
sha256 = "sha256-E4pVXopqQYJW+a5nUf9dMabxJ9nYPu3C2ti8LlY470c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
38
pkgs/applications/audio/pianotrans/default.nix
Normal file
38
pkgs/applications/audio/pianotrans/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pianotrans";
|
||||
version = "1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azuwis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6Otup1Yat1dBZdSoR4lDfpytUQ2RbDXC6ieo835Nw+U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
piano-transcription-inference
|
||||
torch
|
||||
tkinter
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
makeWrapperArgs = [
|
||||
''--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}"''
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple GUI for ByteDance's Piano Transcription with Pedals";
|
||||
homepage = "https://github.com/azuwis/pianotrans";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azuwis ];
|
||||
};
|
||||
}
|
||||
|
|
@ -22,25 +22,25 @@
|
|||
, systemd
|
||||
}:
|
||||
let
|
||||
pname = "YesPlayMusic";
|
||||
version = "0.4.5";
|
||||
pname = "yesplaymusic";
|
||||
version = "0.4.7";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb";
|
||||
hash = "sha256-igd2MzIjwDSOLP0Xi2mSJnEPGWendggPC/MwTDCDui0=";
|
||||
hash = "sha256-nnnHE2OgIqoz3dC+G0219FVBhvnWivLW1BX6+NYo6Ng=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb";
|
||||
hash = "sha256-6MZrAJGXuEJ9HMUje3ppTz2rdaBydwoQKBk6af81pT0=";
|
||||
hash = "sha256-+rrhY5iDDt/nYs0Vz5/Ef0sgpsdBKMtb1aVfCZLgRgg=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg";
|
||||
hash = "sha256-mvmaSrDoIDeOVylkJCVY97yRUHfEI8CysmKrgBUrFGM=";
|
||||
hash = "sha256-z8CASZRWKlj1g3mhxTMMeR4klTvQ2ReSrL7Rt18qQbM=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg";
|
||||
hash = "sha256-Qo03rGS/qB6Sc1IunU7F81WJ/t+mWR7ZRsKYK97LHik=";
|
||||
hash = "sha256-McYLczudKG4tRNIw/Ws4rht0n4tiKA2M99yKtJbdlY8=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
|
|
|||
|
|
@ -37,12 +37,13 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
(toPythonModule chia)
|
||||
pytest # required at runtime by the "test" command
|
||||
pytest-asyncio
|
||||
pytimeparse
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "erigon";
|
||||
version = "2.35.2";
|
||||
version = "2.37.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -11,11 +11,11 @@ buildGoModule {
|
|||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hGJ9SeUYACOuypTJmPnrv4f8ujjsUt3dZbwso+94g3M=";
|
||||
sha256 = "sha256-r/mumt/f0wrOsXyEHo/NX0lJGt8zqXEVNC+9DWDkHAM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lKzJLRCcyhQIV7y1XxqbvTINLlUwWFnflZgGQHYzBjY=";
|
||||
vendorSha256 = "sha256-vSJZ1wIx1CiLE04ZBDnQDQqM2v8BBLxw5qbAsixC3/U=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glow";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "glow";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m673xf67q9gjhd98ysh3dvwiqbj6lgsbm20c4zxyz76vdn5k6x8";
|
||||
sha256 = "sha256-CI0S9XJtJQClpQvI6iSb5rcHafEUwr2V6+Fq560lRfM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ngasfcimizahm80gflxzz3cxz0ir10l62i03l73w8syx4wll0q4";
|
||||
vendorHash = "sha256-2QrHBbhJ04r/vPK2m8J2KZSFrREDCc18tlKd7evghBc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,89 +12,92 @@
|
|||
, makeWrapper
|
||||
, pkg-config
|
||||
, python3
|
||||
, qtbase ? null
|
||||
, qtmultimedia ? null
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, snappy
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
, wrapQtAppsHook ? null
|
||||
, wrapQtAppsHook
|
||||
, zlib
|
||||
, enableQt ? false
|
||||
, enableVulkan ? true
|
||||
, forceWayland ? false
|
||||
}:
|
||||
|
||||
let
|
||||
enableQt = (qtbase != null);
|
||||
frontend = if enableQt then "Qt" else "SDL and headless";
|
||||
vulkanPath = lib.makeLibraryPath [ vulkan-loader ];
|
||||
|
||||
# experimental, see https://github.com/hrydgard/ppsspp/issues/13845
|
||||
vulkanWayland = enableVulkan && forceWayland;
|
||||
in
|
||||
# Only SDL front end needs to specify whether to use Wayland
|
||||
assert forceWayland -> !enableQt;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ppsspp"
|
||||
+ lib.optionalString enableQt "-qt"
|
||||
+ lib.optionalString (!enableQt) "-sdl"
|
||||
+ lib.optionalString forceWayland "-wayland";
|
||||
version = "1.14.4";
|
||||
# Only SDL frontend needs to specify whether to use Wayland
|
||||
assert forceWayland -> !enableQt;
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "ppsspp"
|
||||
+ lib.optionalString enableQt "-qt"
|
||||
+ lib.optionalString (!enableQt) "-sdl"
|
||||
+ lib.optionalString forceWayland "-wayland";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc=";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "v${self.version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev}
|
||||
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
|
||||
'';
|
||||
postPatch = ''
|
||||
substituteInPlace git-version.cmake --replace unknown ${self.src.rev}
|
||||
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
wrapQtAppsHook
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optional enableQt wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
ffmpeg
|
||||
(glew.override { enableEGL = forceWayland; })
|
||||
libzip
|
||||
qtbase
|
||||
qtmultimedia
|
||||
snappy
|
||||
zlib
|
||||
] ++ lib.optional enableVulkan vulkan-loader
|
||||
++ lib.optionals vulkanWayland [ wayland libffi ];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
ffmpeg
|
||||
(glew.override { enableEGL = forceWayland; })
|
||||
libzip
|
||||
snappy
|
||||
zlib
|
||||
] ++ lib.optionals enableQt [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
] ++ lib.optional enableVulkan vulkan-loader
|
||||
++ lib.optionals vulkanWayland [ wayland libffi ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DHEADLESS=${if enableQt then "OFF" else "ON"}"
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
"-DUSE_SYSTEM_FFMPEG=ON"
|
||||
"-DUSE_SYSTEM_LIBZIP=ON"
|
||||
"-DUSE_SYSTEM_SNAPPY=ON"
|
||||
"-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}"
|
||||
"-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}"
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DHEADLESS=${if enableQt then "OFF" else "ON"}"
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
"-DUSE_SYSTEM_FFMPEG=ON"
|
||||
"-DUSE_SYSTEM_LIBZIP=ON"
|
||||
"-DUSE_SYSTEM_SNAPPY=ON"
|
||||
"-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}"
|
||||
"-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
desktopName = "PPSSPP";
|
||||
name = "ppsspp";
|
||||
exec = "ppsspp";
|
||||
icon = "ppsspp";
|
||||
comment = "Play PSP games on your computer";
|
||||
categories = [ "Game" "Emulator" ];
|
||||
})];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
installPhase = let
|
||||
vulkanPath = lib.makeLibraryPath [ vulkan-loader ];
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/{applications,ppsspp}
|
||||
'' + (if enableQt then ''
|
||||
install -Dm555 PPSSPPQt $out/bin/ppsspp
|
||||
|
|
@ -108,14 +111,16 @@ in
|
|||
--prefix LD_LIBRARY_PATH : ${vulkanPath} \
|
||||
'' + "\n" + ''
|
||||
mv assets $out/share/ppsspp
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.ppsspp.org/";
|
||||
description = "A HLE Playstation Portable emulator, written in C++ (${frontend})";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
meta = {
|
||||
homepage = "https://www.ppsspp.org/";
|
||||
description = "A HLE Playstation Portable emulator, written in C++ ("
|
||||
+ (if enableQt then "Qt" else "SDL + headless") + ")";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, icu
|
||||
, pango
|
||||
, inih
|
||||
, withWindowSystem ? "all"
|
||||
, withWindowSystem ? null
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, libGLU
|
||||
|
|
@ -27,6 +27,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
# default value of withWindowSystem
|
||||
withWindowSystem' =
|
||||
if withWindowSystem != null then withWindowSystem
|
||||
else if stdenv.isLinux then "all"
|
||||
else "x11";
|
||||
|
||||
windowSystems = {
|
||||
all = windowSystems.x11 ++ windowSystems.wayland;
|
||||
x11 = [ libGLU xorg.libxcb xorg.libX11 ];
|
||||
|
|
@ -47,7 +53,7 @@ let
|
|||
in
|
||||
|
||||
# check that given window system is valid
|
||||
assert lib.assertOneOf "withWindowSystem" withWindowSystem
|
||||
assert lib.assertOneOf "withWindowSystem" withWindowSystem'
|
||||
(builtins.attrNames windowSystems);
|
||||
# check that every given backend is valid
|
||||
assert builtins.all
|
||||
|
|
@ -56,18 +62,18 @@ assert builtins.all
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imv";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~exec64";
|
||||
repo = "imv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gMAd8skst72QT4jGFH7aRdWeAd4tf/uQgXhGaM/Dpgc=";
|
||||
sha256 = "sha256-LLEEbriHzZhAOQivqHqdr6g7lh4uj++ytlme8AfRjf4=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dwindows=${withWindowSystem}"
|
||||
"-Dwindows=${withWindowSystem'}"
|
||||
"-Dtest=enabled"
|
||||
"-Dman=enabled"
|
||||
] ++ backendFlags;
|
||||
|
|
@ -87,7 +93,7 @@ stdenv.mkDerivation rec {
|
|||
libxkbcommon
|
||||
pango
|
||||
inih
|
||||
] ++ windowSystems."${withWindowSystem}"
|
||||
] ++ windowSystems."${withWindowSystem'}"
|
||||
++ builtins.map (b: backends."${b}") withBackends;
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -96,7 +102,7 @@ stdenv.mkDerivation rec {
|
|||
install -Dm644 ../files/imv.desktop $out/share/applications/
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (withWindowSystem == "all") ''
|
||||
postFixup = lib.optionalString (withWindowSystem' == "all") ''
|
||||
# The `bin/imv` script assumes imv-wayland or imv-x11 in PATH,
|
||||
# so we have to fix those to the binaries we installed into the /nix/store
|
||||
|
||||
|
|
@ -109,9 +115,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A command line image viewer for tiling window managers";
|
||||
homepage = "https://github.com/eXeC64/imv";
|
||||
homepage = "https://sr.ht/~exec64/imv/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rnhmjoj markus1189 ];
|
||||
platforms = platforms.all;
|
||||
badPlatforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } :
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
pname = "qiv";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz";
|
||||
sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28";
|
||||
sha256 = "sha256-7whf/eLUiwWzZlk55a4eNZ06OBAI+4J2hPfW/UxTNwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, sane-backends
|
||||
, sane-frontends
|
||||
, libX11
|
||||
|
|
@ -10,15 +10,19 @@
|
|||
, libusb-compat-0_1
|
||||
, gimpSupport ? false
|
||||
, gimp
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xsane";
|
||||
version = "0.999";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xsane.org/download/xsane-${version}.tar.gz";
|
||||
sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp";
|
||||
src = fetchFromGitLab {
|
||||
owner = "frontend";
|
||||
group = "sane-project";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -31,11 +35,13 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ]
|
||||
++ lib.optional gimpSupport gimp;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.sane-project.org/";
|
||||
description = "Graphical scanning frontend for sane";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "cotp";
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "replydev";
|
||||
repo = "cotp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg=";
|
||||
hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k=";
|
||||
cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gImageReader";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner= "manisandro";
|
||||
repo = "gImageReader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lJ4wPLxVN3NERnru8vLreiWMEUip6xeCXAfoT8DcfiQ=";
|
||||
sha256 = "sha256-vW4FbviMHBiJ3rwJY/yS7JDOoCT72nGV6jEeo+k6ylU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.5.1";
|
||||
version = "5.5.2";
|
||||
pname = "keystore-explorer";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "2C/LkUUuef30PkN7HL0CtcNOjR5uNo9XaCiTatv5hgA=";
|
||||
sha256 = "sha256-mDi/TSYumCg2hAnMOI2QpdAOSlDMpdJPqzatFotAqUk=";
|
||||
};
|
||||
|
||||
# glib is necessary so file dialogs don't hang.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "overmind";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
@ -14,10 +14,10 @@ buildGoModule rec {
|
|||
owner = "DarthSim";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I=";
|
||||
sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY=";
|
||||
vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/DarthSim/overmind";
|
||||
|
|
|
|||
|
|
@ -1,28 +1,30 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, pkg-config
|
||||
, qmake
|
||||
, mkDerivation
|
||||
, qtwayland
|
||||
, qtsvg
|
||||
, postgresql
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmodeler";
|
||||
version = "1.0.0-beta1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmodeler";
|
||||
repo = "pgmodeler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw=";
|
||||
sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ];
|
||||
|
||||
# todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.
|
||||
buildInputs = [ postgresql qtsvg ];
|
||||
buildInputs = [ postgresql qtsvg qtwayland ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A database modeling tool for PostgreSQL";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "argocd-autopilot";
|
||||
version = "0.4.10";
|
||||
version = "0.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj-labs";
|
||||
repo = "argocd-autopilot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DUWJDWqB+jyp3/2/eFP1ss2grNtrvUuvGWK0FYTXObc=";
|
||||
sha256 = "sha256-0y7WP6v1DrAyK9p9cVME9RpNH1ZY0NNMtjHhmPT68kQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0=";
|
||||
vendorHash = "sha256-KkklEcxk6pNbxSkomh3LqlK8jgpGC/pZMBkJgXMUi8E=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PdrU3kKuoT4MP5N2t4E1PIKZOMu8D0ZbUyMTIi/KZ7g=";
|
||||
hash = "sha256-u0ievi2Zj5kerTQWhNPkT3HFdLYVwHOigkvWk6Zc3go=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tanka";
|
||||
version = "0.23.1";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk=";
|
||||
sha256 = "sha256-RZLmbf9ginMbFAaUKL5mK5HIYQslP8Vu8zdh1OJ1P1Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0=";
|
||||
vendorHash = "sha256-g9e0NesI7WdaTHZ57XRlo8as3IWAFlFW4nkyf6+kd40=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -84,13 +84,13 @@
|
|||
"vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ="
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-BlMYx6Ockk8YpiA0wCu2tBwhUIznFJ9b4knSeKA6M/g=",
|
||||
"hash": "sha256-3iB/Vcv6Vzs9teulhu0npl6IuIJRsKy8FkBcIPTKw8A=",
|
||||
"homepage": "https://registry.terraform.io/providers/auth0/auth0",
|
||||
"owner": "auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.42.0",
|
||||
"rev": "v0.43.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-OhtomdRIjKxELnSQGbZvrHAE1ag4VAyuSOMrZvZ5q0s="
|
||||
"vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw="
|
||||
},
|
||||
"avi": {
|
||||
"hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=",
|
||||
|
|
@ -158,11 +158,11 @@
|
|||
"vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY="
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-VntKiBTQxe8lKV8Bb3A0moA/EUzyQQ7CInPjKJL4iBQ=",
|
||||
"hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=",
|
||||
"homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
|
||||
"owner": "F5Networks",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.16.1",
|
||||
"rev": "v1.16.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -304,11 +304,11 @@
|
|||
"vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ="
|
||||
},
|
||||
"digitalocean": {
|
||||
"hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=",
|
||||
"hash": "sha256-ZTt/lfHWD9G/SbZ7mLKPjJAsva5bgRqvvX8Lh1Ci+ts=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.25.2",
|
||||
"rev": "v2.26.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -368,11 +368,11 @@
|
|||
"vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=",
|
||||
"hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=",
|
||||
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
|
||||
"owner": "exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.43.0",
|
||||
"rev": "v0.44.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -1014,11 +1014,11 @@
|
|||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||
},
|
||||
"signalfx": {
|
||||
"hash": "sha256-UgZr2ZFN5RvB7BG+DIXK6eSvTyvaVUKoBTIQ6aAfCpY=",
|
||||
"hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v6.21.0",
|
||||
"rev": "v6.22.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y="
|
||||
},
|
||||
|
|
@ -1032,11 +1032,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-0nofzwxzf19T9klfzp+h3icyN4S92nPfq/HN+qaHK/E=",
|
||||
"hash": "sha256-cy/rolY0Ag/8Vbfs7XERIZxUsF65sap5/EHqU2w44bM=",
|
||||
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
|
||||
"owner": "Snowflake-Labs",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.56.0",
|
||||
"rev": "v0.56.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU="
|
||||
},
|
||||
|
|
@ -1104,13 +1104,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-YhsAKyD3YYYWfxIHcAgMxdQc//0WQvXTsa+fVhSCG6U=",
|
||||
"hash": "sha256-eFyRa4T+CqIeOcEYj4DQP6ypR7AROYrGDYuYSqBfKr0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.41.0",
|
||||
"rev": "v0.42.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LgCS7W6mGGlX4vEhlPYL+Wo/urHv7aiopXWEBoEyL1c="
|
||||
"vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU="
|
||||
},
|
||||
"thunder": {
|
||||
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
|
||||
|
|
@ -1250,13 +1250,13 @@
|
|||
"vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ="
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-g3BdCQKBuxrTn/sScJtRMyL2EoiOF5MpMXMM6I++dEg=",
|
||||
"hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.84.0",
|
||||
"rev": "v0.85.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-q9Rs2yJtI7MVqBcd9wwtyqR9PzmVkhKatbRRZwFm3po="
|
||||
"vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I="
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-graft";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mzz2017";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA=";
|
||||
sha256 = "sha256-zdOcQ/+WXS7pDfnvYdb/FDjMT3yJdwnS8DoH2MIDcDs=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
|
||||
vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI=";
|
||||
vendorHash = "sha256-kx94B1XIXWJOY9Y69lNb/sHWVjsuFuOXrdtJFJrUuAs=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "briar-desktop";
|
||||
version = "0.3.1-beta";
|
||||
version = "0.4.0-beta";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar";
|
||||
sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d";
|
||||
url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar";
|
||||
hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://code.briarproject.org/briar/briar-desktop";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,6 +75,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = ["-DBUILD_TESTS=yes"];
|
||||
|
||||
# Undefined symbols for architecture arm64: "_gpg_strerror"
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error";
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "1.11.20",
|
||||
"desktopSrcHash": "mlB2UvRYzaJ6FWGDOqyZY6NTY7QoWCiCvmFDyWTPuMQ=",
|
||||
"desktopYarnHash": "0ccwsy9ma7sn6d5f9jfv40dhj0y6aax8msx9bihjdmx989nkkh2m",
|
||||
"webSrcHash": "55oLS89Pmy4d7DhBQc4i6boQIH2LgujE7kl6QwcKltw=",
|
||||
"webYarnHash": "1aiq5wvb8cz2a5rc0h11s16fnyak0p9zhzbqwhf1rs6c1gav7777"
|
||||
"version": "1.11.22",
|
||||
"desktopSrcHash": "UJesD6cshsf/NK2ZTzOtAUfH+8JcGP9oCLFhkgfM0E0=",
|
||||
"desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv",
|
||||
"webSrcHash": "B2clSJgKkjvQdIXQgi3bBPaVTDKOjeNBOvkAtcPOkFI=",
|
||||
"webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github
|
||||
|
||||
# FIXME should fix itself on the next release -> remove the warning if that's the case
|
||||
echo "WARNING: on the last update, the yarn.lock had to be patched. Please be careful when updating the hashes!"
|
||||
|
||||
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
|
||||
echo "Regenerates packaging data for the element packages."
|
||||
echo "Usage: $0 [git release tag]"
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "rambox";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
|
||||
sha256 = "sha256-o2ydZodmMAYeU0IiczKNlzY2hgTJbzyJWO/cZSTfAuM=";
|
||||
sha256 = "sha256-NvsrWkdINrQV7V9SLfjtlN+obgQb0u8d/QgjGpZ+fpc=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nextdns";
|
||||
version = "1.38.0";
|
||||
version = "1.39.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextdns";
|
||||
repo = "nextdns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dJ/3MBEsA8M4pfE+GPT/bNnK3n4fL3Hwk0umgMTJAfY=";
|
||||
sha256 = "sha256-7inMloKU/AL4s/p171xCzs4p4+AcLsvsbVsELK9vhFc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98=";
|
||||
vendorHash = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rymdport";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jacalz";
|
||||
repo = "rymdport";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IsUKZL1aOKH01yZ7e/ciAESQKdZSscH+ytI3wptChy0=";
|
||||
hash = "sha256-8Iul8YSxrfP7uG/uSmV+Qro+B1r+mhkOxCICHf204Lg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9Z++E4Lb1+VBvOx5GJ4yQuj7fpwUhlsMhavTifKxVw4=";
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ let
|
|||
inherit (python3Packages) python pygobject3;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gnumeric";
|
||||
version = "1.12.53";
|
||||
version = "1.12.54";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI=";
|
||||
sha256 = "RpBAYv0cSkyTWW0mv2eTLNcvwPjSxaZ8F5GFJ/7oK3Q=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-component" ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "2.5.16";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24=";
|
||||
sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackCmd = ''
|
||||
dpkg-deb -x ${src} ./morgen-${pname}
|
||||
'';
|
||||
|
|
@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
# 2. Fixes startup script
|
||||
substituteInPlace $TMP/work/dist/main.js \
|
||||
--replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \
|
||||
--replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen"
|
||||
--replace "Exec=\".concat(process.execPath," "Exec=\".concat(\"$out/bin/morgen\","
|
||||
asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar
|
||||
|
||||
substituteInPlace $out/share/applications/morgen.desktop \
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flex-ncat";
|
||||
version = "0.1-20221109.1";
|
||||
version = "0.2-20230126.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kc2g-flex-tools";
|
||||
repo = "nCAT";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MlbzPZuEOhb3wJMXWkrt6DK8z0MPgznSm0N9Y6vJVWY=";
|
||||
hash = "sha256-2taQQVTgAFyqtS06zZ+4Qmr/JIqU6mxNQYvxt+L/Mtc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g=";
|
||||
vendorHash = "sha256-Tv6sbfWNOHYwA7v1SpNeM9aHs+3DSFv4V4qxllxrzJc=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kc2g-flex-tools/nCAT";
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "10.8.0";
|
||||
version = "10.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip";
|
||||
sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g=";
|
||||
sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook unzip ];
|
||||
|
|
|
|||
|
|
@ -39,20 +39,15 @@ buildGoModule rec {
|
|||
|
||||
buildInputs = lib.optional pamSupport pam;
|
||||
|
||||
preBuild =
|
||||
let
|
||||
tags = lib.optional pamSupport "pam"
|
||||
++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify";
|
||||
tagsString = lib.concatStringsSep " " tags;
|
||||
in
|
||||
''
|
||||
export buildFlagsArray=(
|
||||
-tags="${tagsString}"
|
||||
-ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
|
||||
)
|
||||
'';
|
||||
tags = lib.optional pamSupport "pam"
|
||||
++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X 'main.Tags=${lib.concatStringsSep " " tags}'"
|
||||
];
|
||||
|
||||
outputs = [ "out" "data" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "15.7.5",
|
||||
"repo_hash": "sha256-zo1b82y114NpX43rJAWQmUhORM1kQxyiSnonqPUQJmY=",
|
||||
"yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l",
|
||||
"version": "15.8.1",
|
||||
"repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=",
|
||||
"yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.7.5-ee",
|
||||
"rev": "v15.8.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.7.5",
|
||||
"GITLAB_PAGES_VERSION": "15.7.5",
|
||||
"GITLAB_SHELL_VERSION": "14.14.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.7.5"
|
||||
"GITALY_SERVER_VERSION": "15.8.1",
|
||||
"GITLAB_PAGES_VERSION": "15.8.1",
|
||||
"GITLAB_SHELL_VERSION": "14.15.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.8.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ GEM
|
|||
reverse_markdown (~> 1.0)
|
||||
rugged (>= 0.24, < 2.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
loofah (2.19.0)
|
||||
loofah (2.19.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
memoizable (0.4.2)
|
||||
|
|
@ -90,7 +90,7 @@ GEM
|
|||
minitest (5.16.3)
|
||||
msgpack (1.3.3)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.13.8)
|
||||
nokogiri (1.13.10)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
octokit (4.20.0)
|
||||
|
|
@ -112,15 +112,15 @@ GEM
|
|||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
public_suffix (4.0.7)
|
||||
racc (1.6.0)
|
||||
racc (1.6.1)
|
||||
rack (2.2.4)
|
||||
rack-test (2.0.2)
|
||||
rack (>= 1.3)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.4.3)
|
||||
loofah (~> 2.3)
|
||||
rails-html-sanitizer (1.4.4)
|
||||
loofah (~> 2.19, >= 2.19.1)
|
||||
rainbow (3.0.0)
|
||||
rbtrace (0.4.14)
|
||||
ffi (>= 1.0.6)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.7.5";
|
||||
version = "15.8.1";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -22,10 +22,10 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FT77MUcErc/16tChwyNczCLtADTOEzKKTsTlhLI6aV8=";
|
||||
sha256 = "sha256-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY=";
|
||||
vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA=";
|
||||
|
||||
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -317,10 +317,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh";
|
||||
sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.19.0";
|
||||
version = "2.19.1";
|
||||
};
|
||||
memoizable = {
|
||||
dependencies = ["thread_safe"];
|
||||
|
|
@ -385,10 +385,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr";
|
||||
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.8";
|
||||
version = "1.13.10";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
|
|
@ -494,10 +494,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
|
||||
sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
|
|
@ -537,10 +537,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf";
|
||||
sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
};
|
||||
rainbow = {
|
||||
source = {
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.14.0";
|
||||
version = "14.15.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zXRLaEy2Q+mm1GLjLB1AxRtBxXAoLw6PA1YOJfvVhoc=";
|
||||
sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
||||
patches = [ ./remove-hardcoded-locations.patch ];
|
||||
|
||||
vendorSha256 = "sha256-mhmM33cXJbqVJ1jY82Mi/nWzz7HXdxxSsFNQknFkwpQ=";
|
||||
vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs=";
|
||||
|
||||
postInstall = ''
|
||||
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.7.5";
|
||||
version = "15.8.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
|
||||
sourceRoot = "source/workhorse";
|
||||
|
||||
vendorSha256 = "sha256-TrLc5L4kLAdu1CEM3ezw6hhF6Icy3rXkFyUaVTUQ6X4=";
|
||||
vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ 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!
|
||||
BundlerChecksum.patch!
|
||||
end
|
||||
|
||||
gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false
|
||||
|
|
@ -37,7 +37,7 @@ gem 'view_component', '~> 2.74.1'
|
|||
gem 'default_value_for', '~> 3.4.0'
|
||||
|
||||
# Supported DBs
|
||||
gem 'pg', '~> 1.4.3'
|
||||
gem 'pg', '~> 1.4.5'
|
||||
|
||||
gem 'rugged', '~> 1.2'
|
||||
gem 'grape-path-helpers', '~> 1.7.1'
|
||||
|
|
@ -84,7 +84,7 @@ gem 'gssapi', group: :kerberos
|
|||
gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
|
||||
|
||||
# Spam and anti-bot protection
|
||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||
gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails'
|
||||
gem 'akismet', '~> 3.0'
|
||||
gem 'invisible_captcha', '~> 2.0.0'
|
||||
|
||||
|
|
@ -113,7 +113,7 @@ gem 'gpgme', '~> 2.0.22'
|
|||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
||||
gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
|
||||
gem 'net-ldap', '~> 0.16.3'
|
||||
gem 'net-ldap', '~> 0.17.1'
|
||||
|
||||
# API
|
||||
gem 'grape', '~> 1.5.2'
|
||||
|
|
@ -200,7 +200,7 @@ gem 'diffy', '~> 3.4'
|
|||
gem 'diff_match_patch', '~> 0.1.0'
|
||||
|
||||
# Application server
|
||||
gem 'rack', '~> 2.2.4'
|
||||
gem 'rack', '~> 2.2.6', '>= 2.2.6.2'
|
||||
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
|
||||
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'
|
||||
|
||||
|
|
@ -304,7 +304,7 @@ gem 'fast_blank'
|
|||
gem 'gitlab-chronic', '~> 0.10.5'
|
||||
gem 'gitlab_chronic_duration', '~> 0.10.6.2'
|
||||
|
||||
gem 'rack-proxy', '~> 0.7.4'
|
||||
gem 'rack-proxy', '~> 0.7.6'
|
||||
|
||||
gem 'sassc-rails', '~> 2.1.0'
|
||||
gem 'autoprefixer-rails', '10.2.5.1'
|
||||
|
|
@ -358,12 +358,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
|
|||
gem 'warning', '~> 1.3.0'
|
||||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 1.2.6', require: false
|
||||
gem 'lefthook', '~> 1.2.7', require: false
|
||||
gem 'rubocop'
|
||||
gem 'solargraph', '~> 0.47.2', require: false
|
||||
|
||||
gem 'letter_opener_web', '~> 2.0.0'
|
||||
gem 'lookbook', '~> 1.2', '>= 1.2.1'
|
||||
gem 'lookbook', '~> 1.4', '>= 1.4.5'
|
||||
|
||||
# Better errors handler
|
||||
gem 'better_errors', '~> 2.9.1'
|
||||
|
|
@ -395,7 +395,7 @@ group :development, :test do
|
|||
gem 'spring', '~> 4.1.0'
|
||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
|
||||
gem 'gitlab-styles', '~> 9.1.0', require: false
|
||||
gem 'gitlab-styles', '~> 9.2.0', require: false
|
||||
|
||||
gem 'haml_lint', '~> 0.40.0', require: false
|
||||
gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
|
|
@ -538,7 +538,7 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f
|
|||
gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
|
||||
|
||||
# File encryption
|
||||
gem 'lockbox', '~> 0.6.2'
|
||||
gem 'lockbox', '~> 1.1.1'
|
||||
|
||||
# Email validation
|
||||
gem 'valid_email', '~> 0.1'
|
||||
|
|
@ -574,6 +574,7 @@ gem 'arr-pm', '~> 0.0.12'
|
|||
|
||||
# Apple plist parsing
|
||||
gem 'CFPropertyList'
|
||||
gem 'app_store_connect'
|
||||
|
||||
# For phone verification
|
||||
gem 'telesignenterprise', '~> 2.2'
|
||||
|
|
|
|||
|
|
@ -172,6 +172,9 @@ GEM
|
|||
apollo_upload_server (2.1.0)
|
||||
actionpack (>= 4.2)
|
||||
graphql (>= 1.8)
|
||||
app_store_connect (0.29.0)
|
||||
activesupport (>= 6.0.0)
|
||||
jwt (>= 1.4, <= 2.5.0)
|
||||
arr-pm (0.0.12)
|
||||
asana (0.10.13)
|
||||
faraday (~> 1.0)
|
||||
|
|
@ -598,7 +601,7 @@ GEM
|
|||
gitlab-sidekiq-fetcher (0.9.0)
|
||||
json (>= 2.5)
|
||||
sidekiq (~> 6.1)
|
||||
gitlab-styles (9.1.0)
|
||||
gitlab-styles (9.2.0)
|
||||
rubocop (~> 1.38.0)
|
||||
rubocop-gitlab-security (~> 0.1.1)
|
||||
rubocop-graphql (~> 0.14)
|
||||
|
|
@ -832,7 +835,7 @@ GEM
|
|||
kramdown (~> 2.0)
|
||||
launchy (2.5.0)
|
||||
addressable (~> 2.7)
|
||||
lefthook (1.2.6)
|
||||
lefthook (1.2.7)
|
||||
letter_opener (1.7.0)
|
||||
launchy (~> 2.2)
|
||||
letter_opener_web (2.0.0)
|
||||
|
|
@ -861,7 +864,7 @@ GEM
|
|||
ffi-compiler (~> 1.0)
|
||||
rake (~> 13.0)
|
||||
locale (2.1.3)
|
||||
lockbox (0.6.2)
|
||||
lockbox (1.1.1)
|
||||
lograge (0.11.2)
|
||||
actionpack (>= 4)
|
||||
activesupport (>= 4)
|
||||
|
|
@ -870,7 +873,7 @@ GEM
|
|||
loofah (2.19.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
lookbook (1.2.1)
|
||||
lookbook (1.4.5)
|
||||
actioncable
|
||||
activemodel
|
||||
css_parser
|
||||
|
|
@ -930,7 +933,7 @@ GEM
|
|||
nenv (0.3.0)
|
||||
net-http-persistent (4.0.1)
|
||||
connection_pool (~> 2.2)
|
||||
net-ldap (0.16.3)
|
||||
net-ldap (0.17.1)
|
||||
net-ntp (2.1.3)
|
||||
net-scp (3.0.0)
|
||||
net-ssh (>= 2.6.5, < 7.0.0)
|
||||
|
|
@ -1068,7 +1071,7 @@ GEM
|
|||
tty-color (~> 0.5)
|
||||
peek (1.1.0)
|
||||
railties (>= 4.0.0)
|
||||
pg (1.4.3)
|
||||
pg (1.4.5)
|
||||
pg_query (2.2.0)
|
||||
google-protobuf (>= 3.19.2)
|
||||
plist (3.6.0)
|
||||
|
|
@ -1108,7 +1111,7 @@ GEM
|
|||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.4.0)
|
||||
racc (1.6.1)
|
||||
rack (2.2.4)
|
||||
rack (2.2.6.2)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (6.6.1)
|
||||
|
|
@ -1123,7 +1126,7 @@ GEM
|
|||
rack (>= 2.1.0)
|
||||
rack-protection (2.2.2)
|
||||
rack
|
||||
rack-proxy (0.7.4)
|
||||
rack-proxy (0.7.6)
|
||||
rack
|
||||
rack-test (2.0.2)
|
||||
rack (>= 1.3)
|
||||
|
|
@ -1150,8 +1153,8 @@ GEM
|
|||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.4.3)
|
||||
loofah (~> 2.3)
|
||||
rails-html-sanitizer (1.4.4)
|
||||
loofah (~> 2.19, >= 2.19.1)
|
||||
rails-i18n (7.0.3)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 6.0.0, < 8)
|
||||
|
|
@ -1174,7 +1177,7 @@ GEM
|
|||
rchardet (1.8.0)
|
||||
rdoc (6.3.2)
|
||||
re2 (1.6.0)
|
||||
recaptcha (4.13.1)
|
||||
recaptcha (5.12.3)
|
||||
json
|
||||
recursive-open-struct (1.1.3)
|
||||
redcarpet (3.5.1)
|
||||
|
|
@ -1274,14 +1277,14 @@ GEM
|
|||
rubocop (>= 0.51)
|
||||
rubocop-graphql (0.18.0)
|
||||
rubocop (>= 0.87, < 2)
|
||||
rubocop-performance (1.15.0)
|
||||
rubocop-performance (1.15.1)
|
||||
rubocop (>= 1.7.0, < 2.0)
|
||||
rubocop-ast (>= 0.4.0)
|
||||
rubocop-rails (2.17.2)
|
||||
rubocop-rails (2.17.3)
|
||||
activesupport (>= 4.2.0)
|
||||
rack (>= 1.1)
|
||||
rubocop (>= 1.33.0, < 2.0)
|
||||
rubocop-rspec (2.15.0)
|
||||
rubocop-rspec (2.16.0)
|
||||
rubocop (~> 1.33)
|
||||
ruby-fogbugz (0.3.0)
|
||||
crack (~> 0.4)
|
||||
|
|
@ -1581,6 +1584,7 @@ DEPENDENCIES
|
|||
addressable (~> 2.8)
|
||||
akismet (~> 3.0)
|
||||
apollo_upload_server (~> 2.1.0)
|
||||
app_store_connect
|
||||
arr-pm (~> 0.0.12)
|
||||
asana (~> 0.10.13)
|
||||
asciidoctor (~> 2.0.17)
|
||||
|
|
@ -1672,7 +1676,7 @@ DEPENDENCIES
|
|||
gitlab-net-dns (~> 0.9.1)
|
||||
gitlab-omniauth-openid-connect (~> 0.10.0)
|
||||
gitlab-sidekiq-fetcher (= 0.9.0)
|
||||
gitlab-styles (~> 9.1.0)
|
||||
gitlab-styles (~> 9.2.0)
|
||||
gitlab_chronic_duration (~> 0.10.6.2)
|
||||
gitlab_omniauth-ldap (~> 2.2.0)
|
||||
gon (~> 6.4.0)
|
||||
|
|
@ -1716,15 +1720,15 @@ DEPENDENCIES
|
|||
knapsack (~> 1.21.1)
|
||||
kramdown (~> 2.3.1)
|
||||
kubeclient (~> 4.9.3)!
|
||||
lefthook (~> 1.2.6)
|
||||
lefthook (~> 1.2.7)
|
||||
letter_opener_web (~> 2.0.0)
|
||||
license_finder (~> 7.0)
|
||||
licensee (~> 9.15)
|
||||
listen (~> 3.7)
|
||||
lockbox (~> 0.6.2)
|
||||
lockbox (~> 1.1.1)
|
||||
lograge (~> 0.5)
|
||||
loofah (~> 2.19.1)
|
||||
lookbook (~> 1.2, >= 1.2.1)
|
||||
lookbook (~> 1.4, >= 1.4.5)
|
||||
lru_redux
|
||||
mail (= 2.7.1)
|
||||
mail-smtp_pool (~> 0.1.0)!
|
||||
|
|
@ -1734,7 +1738,7 @@ DEPENDENCIES
|
|||
mini_magick (~> 4.10.1)
|
||||
minitest (~> 5.11.0)
|
||||
multi_json (~> 1.14.1)
|
||||
net-ldap (~> 0.16.3)
|
||||
net-ldap (~> 0.17.1)
|
||||
net-ntp
|
||||
nokogiri (~> 1.13.10)
|
||||
oauth2 (~> 2.0)
|
||||
|
|
@ -1767,7 +1771,7 @@ DEPENDENCIES
|
|||
parallel (~> 1.19)
|
||||
parslet (~> 1.8)
|
||||
peek (~> 1.1)
|
||||
pg (~> 1.4.3)
|
||||
pg (~> 1.4.5)
|
||||
pg_query (~> 2.2)
|
||||
png_quantizator (~> 0.2.1)
|
||||
premailer-rails (~> 1.10.3)
|
||||
|
|
@ -1777,11 +1781,11 @@ DEPENDENCIES
|
|||
pry-shell (~> 0.5.1)
|
||||
puma (~> 5.6.5)
|
||||
puma_worker_killer (~> 0.3.1)
|
||||
rack (~> 2.2.4)
|
||||
rack (~> 2.2.6, >= 2.2.6.2)
|
||||
rack-attack (~> 6.6.1)
|
||||
rack-cors (~> 1.1.1)
|
||||
rack-oauth2 (~> 1.21.3)
|
||||
rack-proxy (~> 0.7.4)
|
||||
rack-proxy (~> 0.7.6)
|
||||
rack-timeout (~> 0.6.3)
|
||||
rails (~> 6.1.6.1)
|
||||
rails-controller-testing
|
||||
|
|
@ -1790,7 +1794,7 @@ DEPENDENCIES
|
|||
rbtrace (~> 0.4)
|
||||
rdoc (~> 6.3.2)
|
||||
re2 (~> 1.6.0)
|
||||
recaptcha (~> 4.11)
|
||||
recaptcha (~> 5.12)
|
||||
redis (~> 4.8.0)
|
||||
redis-actionpack (~> 5.3.0)
|
||||
redis-namespace (~> 1.9.0)
|
||||
|
|
|
|||
|
|
@ -206,6 +206,17 @@ src:
|
|||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
app_store_connect = {
|
||||
dependencies = ["activesupport" "jwt"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03s3x8b6ifjrqk9ian59i9yyxxl65ykvbb4r424j2hjsh8iskmq1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.29.0";
|
||||
};
|
||||
arr-pm = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
@ -2177,10 +2188,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ch27hxbby16jxvxg1jq3sqdbd3gg7ss4ymxn3yhsjy7gyglxza6";
|
||||
sha256 = "196fhlbhhanpbn5iriccp7m04xgkq7swyk07im50q7z05pxyf1ki";
|
||||
type = "gem";
|
||||
};
|
||||
version = "9.1.0";
|
||||
version = "9.2.0";
|
||||
};
|
||||
gitlab_chronic_duration = {
|
||||
dependencies = ["numerizer"];
|
||||
|
|
@ -3098,10 +3109,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qyylcc57pcf8mwm9dvlzkfjxcpbypnp4q21ni05s7wxalxb12ld";
|
||||
sha256 = "18vcakjkb5fhavq9s6j7zwjc14c652361qws5g1slqb300anfww2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
};
|
||||
letter_opener = {
|
||||
dependencies = ["launchy"];
|
||||
|
|
@ -3194,10 +3205,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g6w327y8d7dr0d7zw6p7hmlwh0hcvb7pkc7xxyf5mn3fmw6fdh1";
|
||||
sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.2";
|
||||
version = "1.1.1";
|
||||
};
|
||||
lograge = {
|
||||
dependencies = ["actionpack" "activesupport" "railties" "request_store"];
|
||||
|
|
@ -3227,10 +3238,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mv5q4gpgzklwrgp7s7mhi0gb7x739qhyrni2n96i2vr4nv48a3l";
|
||||
sha256 = "1nww5h9frmbjfpfy2nb296vn78xnq1qg0lq3lsn52ky8s8rb65dw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
version = "1.4.5";
|
||||
};
|
||||
lru_redux = {
|
||||
groups = ["default"];
|
||||
|
|
@ -3581,10 +3592,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
|
||||
sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.16.3";
|
||||
version = "0.17.1";
|
||||
};
|
||||
net-ntp = {
|
||||
groups = ["default"];
|
||||
|
|
@ -4153,10 +4164,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb";
|
||||
sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.3";
|
||||
version = "1.4.5";
|
||||
};
|
||||
pg_query = {
|
||||
dependencies = ["google-protobuf"];
|
||||
|
|
@ -4358,10 +4369,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa";
|
||||
sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.4";
|
||||
version = "2.2.6.2";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -4424,10 +4435,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1m6j2xk3s3ps3r9vqgwq3flyij9jgkyzanmgiifid8yqhcskgfx8";
|
||||
sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.4";
|
||||
version = "0.7.6";
|
||||
};
|
||||
rack-test = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -4489,10 +4500,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf";
|
||||
sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
};
|
||||
rails-i18n = {
|
||||
dependencies = ["i18n" "railties"];
|
||||
|
|
@ -4614,10 +4625,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w";
|
||||
sha256 = "1vmpppgdy64qa16bvkss0xyzmyyzxv5hwzvc1i6saw4yvm58kl9p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.13.1";
|
||||
version = "5.12.3";
|
||||
};
|
||||
recursive-open-struct = {
|
||||
groups = ["default"];
|
||||
|
|
@ -5020,10 +5031,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c";
|
||||
sha256 = "00ld0hfm2x5hzms9xhkyjfxs8afsmlg1kf0mklk68cq4wwwihkwd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
};
|
||||
rubocop-rails = {
|
||||
dependencies = ["activesupport" "rack" "rubocop"];
|
||||
|
|
@ -5031,10 +5042,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "052viwgi7dbbnq0pxihz1k72dwhph8gw4v2zzw057w42l39hhh6i";
|
||||
sha256 = "1bv51vwcg5m4v35n7653xclw9vv3ifvgbhvc2l79wz2p76ipm1bx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.17.2";
|
||||
version = "2.17.3";
|
||||
};
|
||||
rubocop-rspec = {
|
||||
dependencies = ["rubocop"];
|
||||
|
|
@ -5042,10 +5053,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4";
|
||||
sha256 = "1rpcww107xq6aj5wkypzjj346jaxhqal33wmhlwb9gc2h425yg5k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
};
|
||||
ruby-fogbugz = {
|
||||
dependencies = ["crack" "multipart-post"];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "got";
|
||||
version = "0.82";
|
||||
version = "0.83";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
|
||||
sha256 = "sha256-Lb0WZ4gTuG/GBAnEh9ff/K0ciwjDX3cmEhItMyJ/lmI=";
|
||||
sha256 = "sha256-kNhU6OR9IUNPL72D90nhq2X5vmVW7YUmpnq/EOUvG/8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ];
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ in {
|
|||
} {};
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "2081";
|
||||
x64sha256 = "QzJP25KxczmrR5PZ9ujRSM3V+TrKqiH82plo1bTv48s=";
|
||||
buildVersion = "2082";
|
||||
x64sha256 = "Gl1BrLTSDLRTgrYQW/99o0XRjSIxvnNYRIViZEidcsM=";
|
||||
dev = true;
|
||||
} {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.7.2";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SNNy/oI3ZcMeRLEMS2nSCS/rRaen5WsDfhdlHQCdtP4=";
|
||||
hash = "sha256-8R9cja8Blk+7Sp25bJ9t9e0TvazD41livK+KKAwRpLg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -74,9 +74,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A fast and lightweight fully featured OCI runtime and C library for running containers";
|
||||
homepage = "https://github.com/containers/crun";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
inherit (src.meta) homepage;
|
||||
maintainers = with maintainers; [ ] ++ teams.podman.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@
|
|||
|
||||
rec {
|
||||
dockerGen = {
|
||||
version, rev, sha256
|
||||
, moby-src
|
||||
, runcRev, runcSha256
|
||||
, containerdRev, containerdSha256
|
||||
, tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true
|
||||
version
|
||||
, cliRev, cliHash
|
||||
, mobyRev, mobyHash
|
||||
, runcRev, runcHash
|
||||
, containerdRev, containerdHash
|
||||
, tiniRev, tiniHash, buildxSupport ? true, composeSupport ? true
|
||||
# package dependencies
|
||||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||
|
|
@ -29,7 +30,7 @@ rec {
|
|||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = runcRev;
|
||||
sha256 = runcSha256;
|
||||
hash = runcHash;
|
||||
};
|
||||
|
||||
# docker/runc already include these patches / are not applicable
|
||||
|
|
@ -44,7 +45,7 @@ rec {
|
|||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = containerdRev;
|
||||
sha256 = containerdSha256;
|
||||
hash = containerdHash;
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs
|
||||
|
|
@ -59,7 +60,7 @@ rec {
|
|||
owner = "krallin";
|
||||
repo = "tini";
|
||||
rev = tiniRev;
|
||||
sha256 = tiniSha256;
|
||||
hash = tiniHash;
|
||||
};
|
||||
|
||||
# Do not remove static from make files as we want a static binary
|
||||
|
|
@ -70,6 +71,13 @@ rec {
|
|||
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
|
||||
});
|
||||
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = mobyRev;
|
||||
hash = mobyHash;
|
||||
};
|
||||
|
||||
moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec {
|
||||
pname = "moby";
|
||||
inherit version;
|
||||
|
|
@ -95,7 +103,7 @@ rec {
|
|||
(fetchpatch {
|
||||
name = "buildkit-zfs.patch";
|
||||
url = "https://github.com/moby/moby/pull/43136.patch";
|
||||
sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
|
||||
hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -108,7 +116,7 @@ rec {
|
|||
# build engine
|
||||
cd ./go/src/${goPackagePath}
|
||||
export AUTO_GOPATH=1
|
||||
export DOCKER_GITCOMMIT="${rev}"
|
||||
export DOCKER_GITCOMMIT="${cliRev}"
|
||||
export VERSION="${version}"
|
||||
./hack/make.sh dynbinary
|
||||
cd -
|
||||
|
|
@ -159,8 +167,8 @@ rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = sha256;
|
||||
rev = cliRev;
|
||||
hash = cliHash;
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/docker/cli";
|
||||
|
|
@ -192,7 +200,7 @@ rec {
|
|||
mkdir -p .gopath/src/github.com/docker/
|
||||
ln -sf $PWD .gopath/src/github.com/docker/cli
|
||||
export GOPATH="$PWD/.gopath:$GOPATH"
|
||||
export GITCOMMIT="${rev}"
|
||||
export GITCOMMIT="${cliRev}"
|
||||
export VERSION="${version}"
|
||||
export BUILDTIME="1970-01-01T00:00:00Z"
|
||||
source ./scripts/build/.variables
|
||||
|
|
@ -254,20 +262,16 @@ rec {
|
|||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.21";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hPQ1t7L2fqoFWoinqIrDwFQ1bo9TzMb4l3HmAotIUS8=";
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BcYDh/UEmmURt7hWLWdPTKVu/Nzoeq/shE+HnUoh8b4=";
|
||||
};
|
||||
version = "20.10.23";
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM=";
|
||||
runcRev = "v1.1.4";
|
||||
runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
|
||||
containerdRev = "v1.6.9";
|
||||
containerdSha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU=";
|
||||
runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
|
||||
containerdRev = "v1.6.15";
|
||||
containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA=";
|
||||
tiniRev = "v0.19.0";
|
||||
tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
|
||||
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ in ''
|
|||
export CARGO_CFG_UNIX=1
|
||||
export CARGO_CFG_TARGET_ENV="gnu"
|
||||
export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"}
|
||||
export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits}
|
||||
export CARGO_CFG_TARGET_POINTER_WIDTH=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}
|
||||
export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name}
|
||||
|
||||
export CARGO_MANIFEST_DIR=$(pwd)
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cozette";
|
||||
version = "1.13.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip";
|
||||
hash = "sha256-bMgjNnm84vk7jT2UvgCeQwmjZ+9X1GzGLXIEukhaWGw=";
|
||||
hash = "sha256-nlEnQjQJAFRvZgdGMiloMs4afugmSFnITTIHD+Qkggg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
42
pkgs/data/fonts/roboto-serif/default.nix
Normal file
42
pkgs/data/fonts/roboto-serif/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "roboto-serif";
|
||||
version = "1.007";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/googlefonts/roboto-serif/releases/download/v${version}/RobotoSerifFonts-v${version}.zip";
|
||||
hash = "sha256-A14GztkTvaLBvcm1i3A0Vi9vaz77nFYYoSNggqbffFo=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 variable/*.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Roboto family of fonts";
|
||||
longDescription = ''
|
||||
Google’s signature family of fonts, the default font on Android and
|
||||
Chrome OS, and the recommended font for Google’s visual language,
|
||||
Material Design.
|
||||
'';
|
||||
homepage = "https://github.com/googlefonts/roboto-serif";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "23.01.25";
|
||||
version = "23.01.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bejoClo31C2gO7Ni1cIxaumwDrhumRZgAPpxS1Jt/Fw=";
|
||||
sha256 = "sha256-VmVzU8ACBE4Rx0uVScdQVbygDLE9MmD7ssD1j4ri74g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "23.01.25";
|
||||
version = "23.01.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZScDymdtrDTCrLB9Fp3zxBQt0A3qz0vN1OhBCK5K/HQ=";
|
||||
sha256 = "sha256-uHy1HXCRlPQh9t9bsvClTmP4FW/sP91hYKUXxtdBmdw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
76
pkgs/desktops/deepin/apps/deepin-terminal/default.nix
Normal file
76
pkgs/desktops/deepin/apps/deepin-terminal/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, cmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, at-spi2-core
|
||||
, libsecret
|
||||
, chrpath
|
||||
, lxqt
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-terminal";
|
||||
version = "5.4.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CpI7dyQwrYOYzqVZ6aa+/OAUC3xRyY4ZwzH1mqURTfY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "chore: use GNUInstallDirs in CmakeLists";
|
||||
url = "https://github.com/linuxdeepin/deepin-terminal/commit/b18a2ca8411f09f5573aa2a8403a484b693ec975.patch";
|
||||
sha256 = "sha256-Qy8Jg+7BfZr8tQEsCAzhMEwf6rU96gkgup5f9bMMELY=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
lxqt.lxqt-build-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
qtx11extras
|
||||
at-spi2-core
|
||||
libsecret
|
||||
chrpath
|
||||
gtest
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-terminal";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
26
pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
Normal file
26
pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "dde-account-faces";
|
||||
version = "1.0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NWjR8qxWi2IrcP0cSF+lLxBJ/GrVpk1BfTjVH0ytinY=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}/var" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Account faces of deepin desktop environment";
|
||||
homepage = "https://github.com/linuxdeepin/dde-account-faces";
|
||||
license = with licenses; [ gpl3Plus cc0 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
31
pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
Normal file
31
pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, gtk-engine-murrine
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "deepin-gtk-theme";
|
||||
version = "unstable-2022-07-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "deepin-gtk-theme";
|
||||
rev = "5ac53cbdfba4e6804451605db726876a3be9fb07";
|
||||
sha256 = "sha256-NJ5URKYs4rVzddXxkwJK9ih40f8McVEbj3G1tPFAiMs";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepin GTK Theme";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-gtk-theme";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
46
pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
Normal file
46
pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, xcursorgen
|
||||
, papirus-icon-theme
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "deepin-icon-theme";
|
||||
version = "2021.11.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UC3PbqolcCbVrIEDqMovfJ4oeofMUGJag1A6u7X3Ml8=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gtk3
|
||||
xcursorgen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
papirus-icon-theme
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
postFixup = ''
|
||||
for theme in $out/share/icons/*; do
|
||||
gtk-update-icon-cache $theme
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepin Icon Theme provides the base icon themes on Deepin";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-icon-theme";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
26
pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
Normal file
26
pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "deepin-sound-theme";
|
||||
version = "15.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The freedesktop sound theme for Deepin";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-sound-theme";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -22,6 +22,13 @@ let
|
|||
|
||||
#### Dtk Application
|
||||
deepin-calculator = callPackage ./apps/deepin-calculator { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
|
||||
#### ARTWORK
|
||||
dde-account-faces = callPackage ./artwork/dde-account-faces { };
|
||||
deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { };
|
||||
deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { };
|
||||
deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { };
|
||||
};
|
||||
in
|
||||
lib.makeScope libsForQt5.newScope packages
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pantheon-tweaks";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantheon-tweaks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-L/3PrkfWOGYtqeH/DajGEGCsF5yYnWuESxUTfROSHQ4=";
|
||||
sha256 = "sha256-wj9bvcES8JAgDtW0Damfd8VQNLK+SCFTDVWp/nYGcgI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,32 @@
|
|||
{ lib, mkXfceDerivation, exo, gtk3, libxfce4ui, xfconf, libwnck, libXmu }:
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, exo
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, libwnck
|
||||
, libXmu
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-taskmanager";
|
||||
version = "1.5.5";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA=";
|
||||
|
||||
nativeBuildInputs = [ exo ];
|
||||
buildInputs = [ gtk3 libxfce4ui xfconf libwnck libXmu ];
|
||||
nativeBuildInputs = [
|
||||
exo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libxfce4ui
|
||||
xfconf
|
||||
libwnck
|
||||
libXmu
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy to use task manager for Xfce";
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "libxfce4util";
|
||||
version = "4.18.0";
|
||||
version = "4.18.1";
|
||||
|
||||
sha256 = "sha256-m4O/vTFqzkF6rzyGVw8xdwcX7S/SyOSJo8aCZjniXAw=";
|
||||
sha256 = "sha256-nqASXyHR7wNiNPorlz2ix+Otyir6I9KCCr1vfS6GO8E=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection vala ];
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.18.1";
|
||||
version = "4.18.3";
|
||||
|
||||
sha256 = "sha256-n624TZGygFrOjkQ9fUVJUetRV8JDXYSg89tOHm4Va+M=";
|
||||
sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, mkXfceDerivation
|
||||
, exo
|
||||
, garcon
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libdbusmenu-gtk3
|
||||
|
|
@ -17,9 +16,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-panel";
|
||||
version = "4.18.0";
|
||||
version = "4.18.1";
|
||||
|
||||
sha256 = "sha256-CnZk0Ca3IG6nmiwe7eIvPqpzJgRZHIyqeoTA5cPpU7s=";
|
||||
sha256 = "sha256-5GJO8buOTnRGnm3+kesrZjTprCY1qiyookpW6dzI2AE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
|
|
@ -37,7 +36,6 @@ mkXfceDerivation {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libxfce4util
|
||||
];
|
||||
|
|
@ -49,9 +47,6 @@ mkXfceDerivation {
|
|||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
'';
|
||||
|
||||
# Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Panel for the Xfce desktop environment";
|
||||
maintainers = with maintainers; [ ] ++ teams.xfce.members;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfdesktop";
|
||||
version = "4.18.0";
|
||||
version = "4.18.1";
|
||||
|
||||
sha256 = "sha256-HZVu5UVLKDCWaUpw1SV8E0JLGRG946w4QLlA51rg/Bo=";
|
||||
sha256 = "sha256-33G7X5kA3MCNJ9Aq9ZCafP0Qm/46iUmLFB8clhKwDz8=";
|
||||
|
||||
buildInputs = [
|
||||
exo
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-datetime-plugin";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
rev-prefix = "xfce4-datetime-plugin-";
|
||||
sha256 = "sha256-ov4Wh9Pj01u0NrjDn5p+qXlD2LY3gEUC1e/jPjkn4xQ=";
|
||||
sha256 = "sha256-dpN5ZN7VjgO1GQ6v8NXuBKACyIwIosaiVGtmLEb6auI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-whiskermenu-plugin";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
rev-prefix = "v";
|
||||
odd-unstable = false;
|
||||
sha256 = "sha256-aN8PwH5YIbjiyS5tTcU2AU4LAYC2tBStDxhCXi/dvkQ=";
|
||||
sha256 = "sha256-yp8NpBVgqEv34qmDMKPdy53awgSLtYfeaw1JrxENFps=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ let
|
|||
# or ${with_sysroot}${native_system_header_dir}
|
||||
# While native build (build == host == target) uses passed headers
|
||||
# path as is:
|
||||
# ${native_system_header_dir}
|
||||
# ${with_build_sysroot}${native_system_header_dir}
|
||||
#
|
||||
# Nixpkgs uses flat directory structure for both native and cross
|
||||
# cases. As a result libc headers don't get found for cross case
|
||||
|
|
|
|||
69
pkgs/development/compilers/zig/0.10.nix
Normal file
69
pkgs/development/compilers/zig/0.10.nix
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, coreutils
|
||||
, llvmPackages
|
||||
, libxml2
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zig";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
llvmPackages.llvm.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
coreutils
|
||||
libxml2
|
||||
zlib
|
||||
] ++ (with llvmPackages; [
|
||||
libclang
|
||||
lld
|
||||
llvm
|
||||
]);
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR;
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Zig's build looks at /usr/bin/env to find dynamic linking info. This
|
||||
# doesn't work in Nix' sandbox. Use env from our coreutils instead.
|
||||
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig --replace "/usr/bin/env" "${coreutils}/bin/env"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ziglang.org/";
|
||||
description =
|
||||
"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
# Build fails on Darwin on both AArch64 and x86_64:
|
||||
# https://github.com/NixOS/nixpkgs/pull/210324#issuecomment-1381313616
|
||||
# https://github.com/NixOS/nixpkgs/pull/210324#issuecomment-1381236045
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
repo = "Coq-Equations";
|
||||
inherit version;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.17"; out = "1.3+8.17"; }
|
||||
{ case = "8.16"; out = "1.3+8.16"; }
|
||||
{ case = "8.15"; out = "1.3+8.15"; }
|
||||
{ case = "8.14"; out = "1.3+8.14"; }
|
||||
|
|
@ -54,6 +55,8 @@
|
|||
release."1.3+8.15".sha256 = "1vfcfpsp9zyj0sw0cwibk76nj6n0r6gwh8m1aa3lbvc0b1kbm32k";
|
||||
release."1.3+8.16".rev = "v1.3-8.16";
|
||||
release."1.3+8.16".sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE=";
|
||||
release."1.3+8.17".rev = "v1.3-8.17";
|
||||
release."1.3+8.17".sha256 = "sha256-yNotSIxFkhTg3reZIchGQ7cV9WmTJ7p7hPfKGBiByDw=";
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "25.2.1";
|
||||
sha256 = "xJ3fadveOFZ0TeHhjl3VnAtWyFTOVUIoFubXofvrsT0=";
|
||||
version = "25.2.2";
|
||||
sha256 = "HfEh2IhifFe/gQ4sK99uBnmUGvNCeJ2mlTQf7IzenEs=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmer";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasmerio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t/ObsvUSNGFvHkVH2nl8vLFI+5GUQx6niCgeH4ykk/0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-797I3FBBfnAgNfOdMajm3WNkMo3MUXb1347LBggXrLk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-75/0D0lrV50wH51Ll7M1Lvqj2kRSaJXiQWElxCaF9mE=";
|
||||
cargoHash = "sha256-zUTwhfRLKUixgj3JXiz2QOuwbFhfget+GcFSRL1QJ3w=";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmark-gfm";
|
||||
version = "0.29.0.gfm.8";
|
||||
version = "0.29.0.gfm.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "cmark-gfm";
|
||||
rev = version;
|
||||
sha256 = "sha256-i+y1VORza6pn8a/AfbBKpov/n0ChR9++RC7E8P9p3MY=";
|
||||
sha256 = "sha256-goQtLaiLCyEqVItPfH3e/pFroQWZuVT5oxLs1/GwdoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv
|
||||
, raft-canonical, sqlite }:
|
||||
, raft-canonical, sqlite, lxd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dqlite";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KVQa11gw/8h3Be+52V44W2M+fd7sB35emrS/aUEUGl0=";
|
||||
hash = "sha256-x76f9Sw3BMgWSY7DLIqDjbggp/qVu8mJBtf4znTz9hA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
|
|
@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit lxd;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Expose a SQLite database over the network and replicate it across a
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdcm";
|
||||
version = "3.0.20";
|
||||
version = "3.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malaterre";
|
||||
repo = "GDCM";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MaQk2VlaZxZPNzVF9pUnEzMaXyN0tq2P3kodnGpl6PA=";
|
||||
sha256 = "sha256-BmUJCqCGt+BvVpLG4bzCH4lsqmhWHU0gbOIU2CCIMGU=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goffice";
|
||||
version = "0.10.53";
|
||||
version = "0.10.54";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "J/1YeW+qHNTMASDDTqhTFaCJHscfVbxnk8FOzxaKP1c=";
|
||||
sha256 = "WDXNnVPmT3UmLAOZZu/fTYj0Vvyx8IeM5NEIgqUK1aA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
nv-codec-headers = nv-codec-headers-11;
|
||||
}).overrideAttrs (old: rec {
|
||||
pname = "jellyfin-ffmpeg";
|
||||
version = "5.1.2-6";
|
||||
version = "5.1.2-7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-ffmpeg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YPw29cnScchL4Y2CEatUjzqUW/U9kOdi29Dr577Qy5A=";
|
||||
sha256 = "sha256-OWSixz1QjWthykO55wMAlywe2ihFLugzLH1qg4Qbe3I=";
|
||||
};
|
||||
|
||||
buildInputs = old.buildInputs ++ [ chromaprint ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libffcall";
|
||||
version = "2.2";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz";
|
||||
sha256 = "sha256-6/o3+XtslPrCTs8xk/n8gpUXz4Gu6awtGRr5k9c8t0c=";
|
||||
sha256 = "sha256-jvaZIdvcBrxbuQUTYiY3p7g6cfMfW6N3vp2P2PV5EsI=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "live555";
|
||||
version = "2022.12.01";
|
||||
version = "2023.01.19";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-BXwdPcJMJrM+FMTcNZKIWt8iBAOh4SVeihAeIzxpwQg=";
|
||||
sha256 = "sha256-p8ZJE/f3AHxf3CnqgR48p4HyYicbPkKv3UvBBB2G+pk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, gfortran, perl, libnl
|
||||
{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
|
||||
, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
|
||||
, libpsm2, libfabric, pmix, ucx
|
||||
|
||||
|
|
@ -32,6 +32,14 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "RDMA-osc-perform-CAS-in-shared-memory-if-possible.patch";
|
||||
url = "https://github.com/open-mpi/ompi/pull/10513/commits/0512c135a77a0278e5288e0e119dce24c95ebed4.patch";
|
||||
sha256 = "sha256-K1Gc+hBUkTPY1WqLP6JWo623EUhkoL4ONrqPVDNfFuE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./
|
||||
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinocchio";
|
||||
version = "2.6.14";
|
||||
version = "2.6.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stack-of-tasks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-3dPGeWnIVIErLnd+mxwudTj4qHyN2k7H94EsHYmKV1I=";
|
||||
hash = "sha256-bnm5nbb0mKw76k2J2Qi04n7bmfzadtqV/AmnWSzbb+0=";
|
||||
};
|
||||
|
||||
# error: use of undeclared identifier '__sincos'
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4 }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raft-canonical";
|
||||
version = "0.16.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "raft";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qDLAEhknY+BB83OC6tfi7w/ZY/K492J5ZglLNUoBwbc=";
|
||||
hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
|
|
@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit lxd;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Fully asynchronous C implementation of the Raft consensus protocol
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "umockdev";
|
||||
version = "0.17.15";
|
||||
version = "0.17.16";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "7UGO4rv7B4H0skuXKe8nCtg83czWaln/lEsFnvE2j+8=";
|
||||
sha256 = "sha256-T0BbjOkhn4EX2GBezYFbiUHNgp2uEbSiaxpJ/36jriY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,44 +1,37 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator, stdio, R
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, dune-configurator, stdio, R
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-r";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pveber";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10is2s148kfh3g0pwniyzp5mh48k57ldvn8gm86469zvgxyij1ri";
|
||||
sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs=";
|
||||
};
|
||||
|
||||
# Without the following patch, stub generation fails with:
|
||||
# > Fatal error: exception (Failure "not supported: osVersion")
|
||||
preConfigure = ''
|
||||
substituteInPlace stubgen/stubgen.ml --replace \
|
||||
'failwithf "not supported: %s" name ()' \
|
||||
'sprintf "(* not supported: %s *)" name'
|
||||
substituteInPlace lib/config/discover.ml --replace \
|
||||
' libRmath"' '"'
|
||||
'';
|
||||
|
||||
# This currently fails with dune
|
||||
strictDeps = false;
|
||||
# Finds R and Rmathlib separatley
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pveber/ocaml-r/commit/aa96dc5.patch";
|
||||
sha256 = "sha256-xW33W2ciesyUkDKEH08yfOXv0wP0V6X80or2/n2Nrb4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config R ];
|
||||
buildInputs = [ dune-configurator stdio R ];
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ alcotest ];
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
meta = {
|
||||
# This has been broken by the update to R 4.2.0 (#171597)
|
||||
broken = true;
|
||||
description = "OCaml bindings for the R interpreter";
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.35";
|
||||
version = "9.2.36";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t4t9TATmskvi/Qr9Eje7l+tRiKa+NiwI+KVYqEiSNgo=";
|
||||
hash = "sha256-PEX2SanglMqjtJHuH+gA5dnikh7qqLFiXbmrcIzs1+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, numpy
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airtouch4pyapi";
|
||||
version = "1.0.5";
|
||||
version = "1.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -16,19 +15,10 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "LonePurpleWolf";
|
||||
repo = pname;
|
||||
# https://github.com/LonePurpleWolf/airtouch4pyapi/issues/5
|
||||
rev = "34783888846783c058fe79cec16feda45504f701";
|
||||
sha256 = "17c7fm72p085pg9msvsfdggbskvm12a6jlb5bw1cndrqsqcrxywx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/LonePurpleWolf/airtouch4pyapi/pull/10
|
||||
(fetchpatch {
|
||||
url = "https://github.com/LonePurpleWolf/airtouch4pyapi/commit/5b5d91fad63495c83422e7a850897946ac95b25d.patch";
|
||||
hash = "sha256-tVlCLXuOJSqjbs0jj0iHCIXWZE8wmMV3ChzmE6uq3SM=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
|
|
|||
|
|
@ -47,6 +47,11 @@ buildPythonPackage rec {
|
|||
url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch";
|
||||
hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "add-python-3.11-support.patch";
|
||||
url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch";
|
||||
hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE=";
|
||||
})
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user