Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bfb0bc0461
|
|
@ -50,6 +50,7 @@ with lib.maintainers; {
|
|||
DianaOlympos
|
||||
gleber
|
||||
happysalada
|
||||
minijackson
|
||||
yurrriq
|
||||
];
|
||||
scope = "Maintain BEAM-related packages and modules.";
|
||||
|
|
|
|||
|
|
@ -66,6 +66,45 @@ have a predefined type and string generator already declared under
|
|||
and returning a set with TOML-specific attributes `type` and
|
||||
`generate` as specified [below](#pkgs-formats-result).
|
||||
|
||||
`pkgs.formats.elixirConf { elixir ? pkgs.elixir }`
|
||||
|
||||
: A function taking an attribute set with values
|
||||
|
||||
`elixir`
|
||||
|
||||
: The Elixir package which will be used to format the generated output
|
||||
|
||||
It returns a set with Elixir-Config-specific attributes `type`, `lib`, and
|
||||
`generate` as specified [below](#pkgs-formats-result).
|
||||
|
||||
The `lib` attribute contains functions to be used in settings, for
|
||||
generating special Elixir values:
|
||||
|
||||
`mkRaw elixirCode`
|
||||
|
||||
: Outputs the given string as raw Elixir code
|
||||
|
||||
`mkGetEnv { envVariable, fallback ? null }`
|
||||
|
||||
: Makes the configuration fetch an environment variable at runtime
|
||||
|
||||
`mkAtom atom`
|
||||
|
||||
: Outputs the given string as an Elixir atom, instead of the default
|
||||
Elixir binary string. Note: lowercase atoms still needs to be prefixed
|
||||
with `:`
|
||||
|
||||
`mkTuple array`
|
||||
|
||||
: Outputs the given array as an Elixir tuple, instead of the default
|
||||
Elixir list
|
||||
|
||||
`mkMap attrset`
|
||||
|
||||
: Outputs the given attribute set as an Elixir map, instead of the
|
||||
default Elixir keyword list
|
||||
|
||||
|
||||
::: {#pkgs-formats-result}
|
||||
These functions all return an attribute set with these values:
|
||||
:::
|
||||
|
|
@ -74,6 +113,12 @@ These functions all return an attribute set with these values:
|
|||
|
||||
: A module system type representing a value of the format
|
||||
|
||||
`lib`
|
||||
|
||||
: Utility functions for convenience, or special interactions with the format.
|
||||
This attribute is optional. It may contain inside a `types` attribute
|
||||
containing types specific to this format.
|
||||
|
||||
`generate` *`filename jsonValue`*
|
||||
|
||||
: A function that can render a value of the format to a file. Returns
|
||||
|
|
|
|||
|
|
@ -137,6 +137,97 @@
|
|||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>pkgs.formats.elixirConf { elixir ? pkgs.elixir }</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
A function taking an attribute set with values
|
||||
</para>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>elixir</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
The Elixir package which will be used to format the
|
||||
generated output
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
<para>
|
||||
It returns a set with Elixir-Config-specific attributes
|
||||
<literal>type</literal>, <literal>lib</literal>, and
|
||||
<literal>generate</literal> as specified
|
||||
<link linkend="pkgs-formats-result">below</link>.
|
||||
</para>
|
||||
<para>
|
||||
The <literal>lib</literal> attribute contains functions to
|
||||
be used in settings, for generating special Elixir values:
|
||||
</para>
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>mkRaw elixirCode</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Outputs the given string as raw Elixir code
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>mkGetEnv { envVariable, fallback ? null }</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Makes the configuration fetch an environment variable
|
||||
at runtime
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>mkAtom atom</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Outputs the given string as an Elixir atom, instead of
|
||||
the default Elixir binary string. Note: lowercase
|
||||
atoms still needs to be prefixed with
|
||||
<literal>:</literal>
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>mkTuple array</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Outputs the given array as an Elixir tuple, instead of
|
||||
the default Elixir list
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>mkMap attrset</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Outputs the given attribute set as an Elixir map,
|
||||
instead of the default Elixir keyword list
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
<para xml:id="pkgs-formats-result">
|
||||
These functions all return an attribute set with these values:
|
||||
|
|
@ -152,6 +243,19 @@
|
|||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>lib</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Utility functions for convenience, or special interactions
|
||||
with the format. This attribute is optional. It may contain
|
||||
inside a <literal>types</literal> attribute containing types
|
||||
specific to this format.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>generate</literal>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, lv2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "v1.1.3";
|
||||
version = "1.1.3";
|
||||
pname = "plujain-ramp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
70
pkgs/applications/editors/pinegrow/default.nix
Normal file
70
pkgs/applications/editors/pinegrow/default.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, unzip
|
||||
, udev
|
||||
, nwjs
|
||||
, gcc-unwrapped
|
||||
, autoPatchelfHook
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinegrow";
|
||||
version = "6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip";
|
||||
sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
autoPatchelfHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
nwjs
|
||||
gcc-unwrapped
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
# Extract and copy executable in $out/bin
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/applications $out/bin $out/opt/bin
|
||||
# we can't unzip it in $out/lib, because nw.js will start with
|
||||
# an empty screen. Therefore it will be unzipped in a non-typical
|
||||
# folder and symlinked.
|
||||
unzip $src -d $out/opt/pinegrow
|
||||
substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \
|
||||
--replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"'
|
||||
mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop
|
||||
ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/Pinegrow
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||
wrapGApp "$out/opt/pinegrow/PinegrowLibrary" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pinegrow.com";
|
||||
description = "UI Web Editor";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ unfreeRedistributable ];
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
71
pkgs/applications/misc/emojipick/default.nix
Normal file
71
pkgs/applications/misc/emojipick/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, python3
|
||||
, xclip
|
||||
, libnotify
|
||||
, dmenu
|
||||
, rofi
|
||||
, emojipick-use-rofi ? false
|
||||
, emojipick-copy-to-clipboard ? true
|
||||
, emojipick-show-notifications ? true
|
||||
, emojipick-print-emoji ? true
|
||||
, emojipick-font-family ? "Noto Color Emoji"
|
||||
, emojipick-font-size ? "18"
|
||||
}:
|
||||
|
||||
let
|
||||
boolToInt = b: if b then "1" else "0"; # Convert boolean to integer string
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "emojipick";
|
||||
version = "2021-01-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thingsiplay";
|
||||
repo = "emojipick";
|
||||
rev = "20210127";
|
||||
sha256 = "1kib3cyx6z9v9qw6yrfx5sklanpk5jbxjc317wi7i7ljrg0vdazp";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
# Patch configuration
|
||||
# notify-send has to be patched in a bash file
|
||||
postPatch = ''
|
||||
substituteInPlace emojipick \
|
||||
--replace "use_rofi=0" "use_rofi=${boolToInt emojipick-use-rofi}" \
|
||||
--replace "copy_to_clipboard=1" "copy_to_clipboard=${boolToInt emojipick-copy-to-clipboard}" \
|
||||
--replace "show_notification=1" "show_notification=${boolToInt emojipick-show-notifications}" \
|
||||
--replace "print_emoji=1" "print_emoji=${boolToInt emojipick-print-emoji}" \
|
||||
--replace "font_family='\"Noto Color Emoji\"'" "font_family='\"${emojipick-font-family}\"'" \
|
||||
--replace 'font_size="18"' 'font_size="${emojipick-font-size}"' \
|
||||
${lib.optionalString emojipick-use-rofi "--replace 'rofi ' '${rofi}/bin/rofi '"} \
|
||||
--replace notify-send ${libnotify}/bin/notify-send
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
xclip
|
||||
libnotify
|
||||
] ++ (if emojipick-use-rofi then [rofi] else [dmenu]);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp ./emojipick $out/bin
|
||||
cp ./emojiget.py $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get a selection of emojis with dmenu or rofi";
|
||||
homepage = "https://github.com/thingsiplay/emojipick";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ alexnortung ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
47
pkgs/applications/misc/gometer/default.nix
Normal file
47
pkgs/applications/misc/gometer/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gometer";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm";
|
||||
sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rpmextract
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
unpackPhase = ''
|
||||
rpmextract ${src}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
mkdir $out/share/applications
|
||||
mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop
|
||||
substituteInPlace $out/share/applications/gometer.desktop \
|
||||
--replace '/opt/goMeter/' ""
|
||||
|
||||
makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \
|
||||
--add-flags $out/opt/goMeter/package.nw
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analytic-Tracking tool for GoLance";
|
||||
homepage = "https://golance.com/download-gometer";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,15 +4,16 @@ python3Packages.buildPythonApplication rec {
|
|||
pname = "nerd-font-patcher";
|
||||
version = "2.1.0";
|
||||
|
||||
# The size of the nerd fonts repository is bigger than 2GB, because it
|
||||
# contains a lot of fonts and the patcher.
|
||||
# until https://github.com/ryanoasis/nerd-fonts/issues/484 is not fixed,
|
||||
# we download the patcher from an alternative repository
|
||||
# This uses a sparse checkout because the repo is >2GB without it
|
||||
src = fetchFromGitHub {
|
||||
owner = "betaboon";
|
||||
repo = "nerd-fonts-patcher";
|
||||
rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0";
|
||||
sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI=";
|
||||
owner = "ryanoasis";
|
||||
repo = "nerd-fonts";
|
||||
rev = "v${version}";
|
||||
sparseCheckout = ''
|
||||
font-patcher
|
||||
/src/glyphs
|
||||
'';
|
||||
sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ fontforge ];
|
||||
|
|
|
|||
|
|
@ -37,7 +37,8 @@ let
|
|||
# base pkg/lib
|
||||
baseLib = python3Packages.callPackage ./lib.nix { };
|
||||
in mkDerivation {
|
||||
inherit (baseLib) pname version src;
|
||||
pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full";
|
||||
inherit (baseLib) version src;
|
||||
|
||||
nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ];
|
||||
buildInputs = [ qtbase ] ++ optionals gstreamerSupport
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ let
|
|||
"libpng"
|
||||
"libwebp"
|
||||
"libxslt"
|
||||
"opus"
|
||||
# "opus"
|
||||
];
|
||||
|
||||
opusWithCustomModes = libopus.override {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ newScope, config, stdenv, fetchurl, makeWrapper
|
||||
, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
|
||||
, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
|
||||
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
|
||||
, libva, pipewire, wayland
|
||||
, gcc, nspr, nss, runCommand
|
||||
|
|
@ -54,6 +54,9 @@ let
|
|||
inherit (upstream-info.deps.gn) url rev sha256;
|
||||
};
|
||||
});
|
||||
} // lib.optionalAttrs (chromiumVersionAtLeast "99") rec {
|
||||
llvmPackages = llvmPackages_14;
|
||||
stdenv = llvmPackages_14.stdenv;
|
||||
});
|
||||
|
||||
browser = callPackage ./browser.nix {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 26 Feb 2022 12:33:13 +0100
|
||||
Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD
|
||||
|
||||
---
|
||||
build.gradle | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index cbb587f..3b06e80 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -82,6 +82,9 @@ static String getVersion() {
|
||||
|
||||
repositories {
|
||||
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||
+ maven {
|
||||
+ url "https://plugins.gradle.org/m2/"
|
||||
+ }
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
@@ -102,6 +105,8 @@ dependencies {
|
||||
implementation 'io.prometheus:simpleclient_httpserver:0.14.1'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
||||
implementation 'io.sentry:sentry:5.6.1'
|
||||
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
|
||||
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
}
|
||||
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sat, 26 Feb 2022 12:36:15 +0100
|
||||
Subject: [PATCH 2/2] buildconfig/local deps fixes
|
||||
|
||||
---
|
||||
build.gradle | 20 ++++++++++++++++++--
|
||||
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index cbb587f..ad836cf 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -9,10 +9,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal
|
||||
import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||
|
||||
+buildscript {
|
||||
+ repositories {
|
||||
+ maven {
|
||||
+ url(uri("@deps@"))
|
||||
+ }
|
||||
+ }
|
||||
+ dependencies {
|
||||
+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3"
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
plugins {
|
||||
- id 'com.github.gmazzo.buildconfig' version '3.0.3'
|
||||
id 'application'
|
||||
}
|
||||
+apply plugin: "com.github.gmazzo.buildconfig"
|
||||
|
||||
compileJava.options.encoding = 'UTF-8'
|
||||
|
||||
@@ -82,7 +93,10 @@ static String getVersion() {
|
||||
|
||||
repositories {
|
||||
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||
- mavenCentral()
|
||||
+ mavenLocal()
|
||||
+ maven {
|
||||
+ url uri("@deps@")
|
||||
+ }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -102,6 +116,8 @@ dependencies {
|
||||
implementation 'io.prometheus:simpleclient_httpserver:0.14.1'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
||||
implementation 'io.sentry:sentry:5.6.1'
|
||||
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
|
||||
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
}
|
||||
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
@ -1,34 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
|
||||
, makeWrapper, fetchpatch
|
||||
, makeWrapper, fetchpatch, substituteAll
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "signald";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg=";
|
||||
};
|
||||
|
||||
log4j-update-cve-2021-44228 = fetchpatch {
|
||||
url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch";
|
||||
sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM=";
|
||||
};
|
||||
|
||||
buildConfigJar = fetchurl {
|
||||
url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar";
|
||||
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
|
||||
sha256 = "sha256-eN6lEs6PuRczbzQZmGlNf6Ahp4FbWpA3EArlATEiZHU=";
|
||||
};
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
pname = "${pname}-deps";
|
||||
inherit src version;
|
||||
patches = [ log4j-update-cve-2021-44228 ];
|
||||
nativeBuildInputs = [ gradle_6 perl ];
|
||||
patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ];
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
gradle --no-daemon build
|
||||
|
|
@ -36,7 +26,7 @@ let
|
|||
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
||||
installPhase = ''
|
||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
|
||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \
|
||||
| sh
|
||||
'';
|
||||
# Don't move info to share/
|
||||
|
|
@ -45,8 +35,8 @@ let
|
|||
outputHashMode = "recursive";
|
||||
# Downloaded jars differ by platform
|
||||
outputHash = {
|
||||
x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8=";
|
||||
aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc=";
|
||||
x86_64-linux = "sha256-kZ25p+lIkOqNoFFBgJRYFcvKJenKICVa1PasaaEHmRA=";
|
||||
aarch64-linux = "sha256-CbFNigp3R7ETX0uXv6PNuhDpmPc4sowbWmwZ+5txXQs=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
|
|
@ -54,22 +44,17 @@ in stdenv.mkDerivation rec {
|
|||
inherit pname src version;
|
||||
|
||||
patches = [
|
||||
./gradle-plugin.patch
|
||||
log4j-update-cve-2021-44228
|
||||
(substituteAll {
|
||||
src = ./0002-buildconfig-local-deps-fixes.patch;
|
||||
inherit deps;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
||||
# Use the local packages from -deps
|
||||
sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle
|
||||
|
||||
gradle --offline --no-daemon distTar
|
||||
|
||||
runHook postBuild
|
||||
|
|
@ -100,7 +85,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://signald.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
maintainers = with maintainers; [ expipiplus1 ma27 ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/build.gradle b/build.gradle
|
||||
index 11d7a99..66805bb 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||
import org.xml.sax.SAXParseException
|
||||
|
||||
-plugins {
|
||||
- id 'de.fuerstenau.buildconfig' version '1.1.8'
|
||||
+buildscript {
|
||||
+ dependencies {
|
||||
+ classpath files ("BuildConfig.jar")
|
||||
+ }
|
||||
}
|
||||
+apply plugin: 'de.fuerstenau.buildconfig'
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'application'
|
||||
150
pkgs/applications/networking/n8n/node-packages.nix
generated
150
pkgs/applications/networking/n8n/node-packages.nix
generated
|
|
@ -265,13 +265,13 @@ let
|
|||
sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==";
|
||||
};
|
||||
};
|
||||
"@oclif/parser-3.8.6" = {
|
||||
"@oclif/parser-3.8.7" = {
|
||||
name = "_at_oclif_slash_parser";
|
||||
packageName = "@oclif/parser";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz";
|
||||
sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw==";
|
||||
url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz";
|
||||
sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q==";
|
||||
};
|
||||
};
|
||||
"@opentelemetry/api-1.1.0" = {
|
||||
|
|
@ -445,13 +445,13 @@ let
|
|||
sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==";
|
||||
};
|
||||
};
|
||||
"@types/lodash-4.14.178" = {
|
||||
"@types/lodash-4.14.179" = {
|
||||
name = "_at_types_slash_lodash";
|
||||
packageName = "@types/lodash";
|
||||
version = "4.14.178";
|
||||
version = "4.14.179";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz";
|
||||
sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==";
|
||||
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz";
|
||||
sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==";
|
||||
};
|
||||
};
|
||||
"@types/lossless-json-1.0.1" = {
|
||||
|
|
@ -481,13 +481,13 @@ let
|
|||
sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A==";
|
||||
};
|
||||
};
|
||||
"@types/node-17.0.18" = {
|
||||
"@types/node-17.0.21" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "17.0.18";
|
||||
version = "17.0.21";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz";
|
||||
sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz";
|
||||
sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==";
|
||||
};
|
||||
};
|
||||
"@types/node-fetch-2.6.1" = {
|
||||
|
|
@ -976,13 +976,13 @@ let
|
|||
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1077.0" = {
|
||||
"aws-sdk-2.1082.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1077.0";
|
||||
version = "2.1082.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz";
|
||||
sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz";
|
||||
sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
|
@ -1894,6 +1894,15 @@ let
|
|||
sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==";
|
||||
};
|
||||
};
|
||||
"cssfilter-0.0.10" = {
|
||||
name = "cssfilter";
|
||||
packageName = "cssfilter";
|
||||
version = "0.0.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz";
|
||||
sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae";
|
||||
};
|
||||
};
|
||||
"dashdash-1.14.1" = {
|
||||
name = "dashdash";
|
||||
packageName = "dashdash";
|
||||
|
|
@ -4441,13 +4450,13 @@ let
|
|||
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
|
||||
};
|
||||
};
|
||||
"mssql-6.4.0" = {
|
||||
"mssql-6.4.1" = {
|
||||
name = "mssql";
|
||||
packageName = "mssql";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mssql/-/mssql-6.4.0.tgz";
|
||||
sha512 = "Mtgu3PXqoaL7aHCMurttvEHibjvz5XKjlR6ZCDyAeKtDBORpxm88JyzEU2EESVf7588GulYKc7Gr+Txf5CICBQ==";
|
||||
url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz";
|
||||
sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw==";
|
||||
};
|
||||
};
|
||||
"mute-stream-0.0.8" = {
|
||||
|
|
@ -4477,49 +4486,49 @@ let
|
|||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.105.0" = {
|
||||
"n8n-core-0.106.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.105.0";
|
||||
version = "0.106.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.105.0.tgz";
|
||||
sha512 = "rYAtchFf7V94M9UP1ZCu9ie9O6OWncNconuzO9I1D/QLjBNVGzu0+SsG8be5bGTrAWO0WiNYdj84qMqqJS4NWg==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz";
|
||||
sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.11.0" = {
|
||||
"n8n-design-system-0.12.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz";
|
||||
sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz";
|
||||
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.131.0" = {
|
||||
"n8n-editor-ui-0.132.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.131.0";
|
||||
version = "0.132.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.131.0.tgz";
|
||||
sha512 = "Sexo31sn8PdiNjDckNfDCXBs9MBR/hF5NzuFtUCUNaXPR6Z5gql6EhPT+fJfG9Wdsj09L3vV+j3gTAbXqRgPIw==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz";
|
||||
sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.162.0" = {
|
||||
"n8n-nodes-base-0.163.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.162.0";
|
||||
version = "0.163.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.162.0.tgz";
|
||||
sha512 = "bi7vs//5OHrW6RowouusBwUzKutFKnysLWdDrlxlCENGtRDtI+7ELrLMWnKs6PYTRWz0OSBHpEMN64MDEIoEZg==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz";
|
||||
sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.87.0" = {
|
||||
"n8n-workflow-0.88.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.87.0";
|
||||
version = "0.88.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.87.0.tgz";
|
||||
sha512 = "ei5fvQK4jM3NotOA36d267o243m2MdlSPlG6cIutqx4lgUd1oXX7mYyCJzF3/kNcWbiI8QjdhUoURgdCOEzn8g==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz";
|
||||
sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
|
|
@ -7015,13 +7024,13 @@ let
|
|||
sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
|
||||
};
|
||||
};
|
||||
"url-parse-1.5.9" = {
|
||||
"url-parse-1.5.10" = {
|
||||
name = "url-parse";
|
||||
packageName = "url-parse";
|
||||
version = "1.5.9";
|
||||
version = "1.5.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz";
|
||||
sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==";
|
||||
url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz";
|
||||
sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==";
|
||||
};
|
||||
};
|
||||
"utf7-1.0.2" = {
|
||||
|
|
@ -7141,13 +7150,13 @@ let
|
|||
sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
|
||||
};
|
||||
};
|
||||
"vm2-3.9.8" = {
|
||||
"vm2-3.9.9" = {
|
||||
name = "vm2";
|
||||
packageName = "vm2";
|
||||
version = "3.9.8";
|
||||
version = "3.9.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz";
|
||||
sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==";
|
||||
url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz";
|
||||
sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==";
|
||||
};
|
||||
};
|
||||
"vue-fragment-1.5.2" = {
|
||||
|
|
@ -7366,6 +7375,15 @@ let
|
|||
sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
|
||||
};
|
||||
};
|
||||
"xss-1.0.10" = {
|
||||
name = "xss";
|
||||
packageName = "xss";
|
||||
version = "1.0.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
|
||||
sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
|
||||
};
|
||||
};
|
||||
"xtend-4.0.2" = {
|
||||
name = "xtend";
|
||||
packageName = "xtend";
|
||||
|
|
@ -7462,10 +7480,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.164.1";
|
||||
version = "0.165.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.164.1.tgz";
|
||||
sha512 = "8eUhHHikLspebbc1AjatdSQeaQAVgeYMIMFZmiUPMUw8FVtQ67otse6t/RvBE2RXTzxKer54Nr8eA+cF5dHi8g==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz";
|
||||
sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
|
|
@ -7551,7 +7569,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."@oclif/linewrap-1.0.0"
|
||||
(sources."@oclif/parser-3.8.6" // {
|
||||
(sources."@oclif/parser-3.8.7" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
];
|
||||
|
|
@ -7574,10 +7592,10 @@ in
|
|||
sources."@types/ftp-0.3.33"
|
||||
sources."@types/json-diff-0.5.2"
|
||||
sources."@types/jsonwebtoken-8.5.8"
|
||||
sources."@types/lodash-4.14.178"
|
||||
sources."@types/lodash-4.14.179"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-1.3.2"
|
||||
sources."@types/node-17.0.18"
|
||||
sources."@types/node-17.0.21"
|
||||
(sources."@types/node-fetch-2.6.1" // {
|
||||
dependencies = [
|
||||
sources."form-data-3.0.1"
|
||||
|
|
@ -7646,7 +7664,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.3"
|
||||
(sources."aws-sdk-2.1077.0" // {
|
||||
(sources."aws-sdk-2.1082.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
|
@ -7839,6 +7857,7 @@ in
|
|||
sources."csrf-3.1.0"
|
||||
sources."css-select-4.2.1"
|
||||
sources."css-what-5.1.0"
|
||||
sources."cssfilter-0.0.10"
|
||||
sources."dashdash-1.14.1"
|
||||
sources."date-utils-1.2.21"
|
||||
sources."debug-4.3.3"
|
||||
|
|
@ -8196,7 +8215,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."ms-2.1.2"
|
||||
sources."mssql-6.4.0"
|
||||
sources."mssql-6.4.1"
|
||||
sources."mute-stream-0.0.8"
|
||||
(sources."mysql2-2.3.3" // {
|
||||
dependencies = [
|
||||
|
|
@ -8205,19 +8224,19 @@ in
|
|||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
(sources."n8n-core-0.105.0" // {
|
||||
(sources."n8n-core-0.106.0" // {
|
||||
dependencies = [
|
||||
sources."qs-6.10.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-design-system-0.11.0"
|
||||
sources."n8n-editor-ui-0.131.0"
|
||||
(sources."n8n-nodes-base-0.162.0" // {
|
||||
sources."n8n-design-system-0.12.0"
|
||||
sources."n8n-editor-ui-0.132.0"
|
||||
(sources."n8n-nodes-base-0.163.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.87.0"
|
||||
sources."n8n-workflow-0.88.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
|
|
@ -8627,7 +8646,7 @@ in
|
|||
sources."punycode-1.3.2"
|
||||
];
|
||||
})
|
||||
sources."url-parse-1.5.9"
|
||||
sources."url-parse-1.5.10"
|
||||
(sources."utf7-1.0.2" // {
|
||||
dependencies = [
|
||||
sources."semver-5.3.0"
|
||||
|
|
@ -8643,7 +8662,7 @@ in
|
|||
sources."validator-13.7.0"
|
||||
sources."vary-1.1.2"
|
||||
sources."verror-1.10.0"
|
||||
sources."vm2-3.9.8"
|
||||
sources."vm2-3.9.9"
|
||||
sources."vue-fragment-1.5.2"
|
||||
sources."vue-i18n-8.27.0"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
|
|
@ -8676,6 +8695,11 @@ in
|
|||
sources."xmlbuilder-11.0.1"
|
||||
sources."xpath.js-1.1.0"
|
||||
sources."xregexp-2.0.0"
|
||||
(sources."xss-1.0.10" // {
|
||||
dependencies = [
|
||||
sources."commander-2.20.3"
|
||||
];
|
||||
})
|
||||
sources."xtend-4.0.2"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yallist-4.0.0"
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8=";
|
||||
sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neuron";
|
||||
pname = "neuron${lib.optionalString useMpi "-mpi"}";
|
||||
version = "7.5";
|
||||
|
||||
nativeBuildInputs = [ which pkg-config automake autoconf libtool ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "RAxML";
|
||||
pname = "RAxML${lib.optionalString useMpi "-mpi"}";
|
||||
version = "8.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stamatak";
|
||||
repo = "standard-${pname}";
|
||||
repo = "standard-RAxML";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
, eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }:
|
||||
|
||||
clangStdenv.mkDerivation rec {
|
||||
version = "v1.0.1";
|
||||
version = "1.0.1";
|
||||
pname = "d-SEAMS";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d-SEAMS";
|
||||
repo = "seams-core";
|
||||
rev = "v1.0.1";
|
||||
rev = "v${version}";
|
||||
sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial";
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -34,9 +34,9 @@ let
|
|||
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE=";
|
||||
sourceRoot = "${pname}-${version}/rust";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jwm";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joewing";
|
||||
repo = "jwm";
|
||||
rev = "v${version}";
|
||||
sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj";
|
||||
sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext which autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,31 @@
|
|||
{ lib, fetchurl }:
|
||||
{ lib, fetchurl, stdenv }:
|
||||
|
||||
let
|
||||
pname = "agave";
|
||||
version = "35";
|
||||
in fetchurl {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
|
||||
version = "37";
|
||||
|
||||
downloadToTemp = true;
|
||||
recursiveHash = true;
|
||||
postFetch = ''
|
||||
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
|
||||
mkAg = name: hash: fetchurl {
|
||||
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-${name}.ttf";
|
||||
sha256 = hash;
|
||||
name = "Agave-${name}.ttf";
|
||||
};
|
||||
# There are slashed variants, but with same name so only bundle the default versions for now:
|
||||
fonts = [
|
||||
(mkAg "Regular" "sha256-vX1VhEgqy9rQ7hPmAgBGxKyIs2QSAYqZC/mL/2BIOrA=")
|
||||
(mkAg "Bold" "sha256-Ax/l/RKyc03law0ThiLac/7HHV4+YxibKzcZnjZs6VI=")
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
srcs = fonts;
|
||||
sourceRoot = ".";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D $srcs -t $out/share/fonts/truetype/
|
||||
'';
|
||||
|
||||
sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz";
|
||||
|
||||
meta = with lib; {
|
||||
description = "truetype monospaced typeface designed for X environments";
|
||||
homepage = "https://b.agaric.net/page/agave";
|
||||
|
|
|
|||
|
|
@ -4,25 +4,47 @@
|
|||
, glib
|
||||
, gnome-shell
|
||||
, gnome-themes-extra
|
||||
, jdupes
|
||||
, libxml2
|
||||
, sassc
|
||||
, util-linux
|
||||
, altVariants ? [] # default: normal
|
||||
, colorVariants ? [] # default: all
|
||||
, opacityVariants ? [] # default: all
|
||||
, themeVariants ? [] # default: default (BigSur-like theme)
|
||||
, nautilusSize ? null # default: 200px
|
||||
, panelOpacity ? null # default: 15%
|
||||
, panelSize ? null # default: 32px
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "whitesur-gtk-theme";
|
||||
single = x: lib.optional (x != null) x;
|
||||
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
|
||||
lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
|
||||
lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
|
||||
lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
|
||||
lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize)
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "whitesur-gtk-theme";
|
||||
version = "2021-12-28";
|
||||
version = "2022-02-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc";
|
||||
sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
gnome-shell
|
||||
jdupes
|
||||
libxml2
|
||||
sassc
|
||||
util-linux
|
||||
|
|
@ -48,8 +70,21 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/themes
|
||||
./install.sh --dest $out/share/themes --alt all --theme all
|
||||
|
||||
./install.sh \
|
||||
${toString (map (x: "--alt " + x) altVariants)} \
|
||||
${toString (map (x: "--color " + x) colorVariants)} \
|
||||
${toString (map (x: "--opacity " + x) opacityVariants)} \
|
||||
${toString (map (x: "--theme " + x) themeVariants)} \
|
||||
${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
|
||||
${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \
|
||||
${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
|
||||
--dest $out/share/themes
|
||||
|
||||
jdupes --link-soft --recurse $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt
|
||||
index e1a29b884d17..9d542f8fbfc1 100644
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9bcc135665d0..d38679ed41e9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
||||
|
||||
set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
|
||||
set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
|
||||
- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
|
||||
@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE)
|
||||
|
||||
set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")
|
||||
set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")
|
||||
- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")
|
||||
+ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")
|
||||
|
||||
|
||||
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}
|
||||
NO_DEFAULT_PATH)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, pantheon
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
{ stdenv
|
||||
, lib
|
||||
, autoreconfHook
|
||||
, gitUpdater
|
||||
, gnome
|
||||
, which
|
||||
, fetchgit
|
||||
|
|
@ -23,26 +22,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bamf";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.launchpad.net/~unity-team/bamf";
|
||||
rev = "${version}+21.10.20210710-0ubuntu1";
|
||||
sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0";
|
||||
rev = version;
|
||||
sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
(python3.withPackages (ps: with ps; [ lxml ])) # Tests
|
||||
autoconf
|
||||
automake
|
||||
autoreconfHook
|
||||
dbus
|
||||
docbook_xsl
|
||||
gnome.gnome-common
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
libtool
|
||||
pkg-config
|
||||
vala
|
||||
which
|
||||
|
|
@ -69,22 +66,23 @@ stdenv.mkDerivation rec {
|
|||
"--enable-headless-tests"
|
||||
];
|
||||
|
||||
# fix paths
|
||||
# Fix paths
|
||||
makeFlags = [
|
||||
"INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/"
|
||||
"INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
# TODO: Requires /etc/machine-id
|
||||
doCheck = false;
|
||||
|
||||
# glib-2.62 deprecations
|
||||
# Ignore deprecation errors
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
inherit pname version;
|
||||
ignoredVersions = ".ubuntu.*";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Application matching framework";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
assert mpiSupport -> mpi != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "highfive";
|
||||
pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
let
|
||||
inherit (hdf5) mpiSupport mpi;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "netcdf";
|
||||
pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
|
||||
version = "4.8.0"; # Remove patch mentioned below on upgrade
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz";
|
||||
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz";
|
||||
sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "NGT";
|
||||
version = "v1.12.3-alpha";
|
||||
version = "1.12.3-alpha";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yahoojapan";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rang";
|
||||
version = "v3.1.0";
|
||||
version = "3.1.0";
|
||||
src = fetchFromGitHub {
|
||||
"owner" = "agauniyal";
|
||||
owner = "agauniyal";
|
||||
repo = "rang";
|
||||
"rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762";
|
||||
"sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s";
|
||||
rev = "cabe04d6d6b05356fa8f9741704924788f0dd762";
|
||||
sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlite";
|
||||
pname = "sqlite${optionalString interactive "-interactive"}";
|
||||
version = "3.37.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
|
|
|
|||
|
|
@ -17,30 +17,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioitertools";
|
||||
version = "0.8.0";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46";
|
||||
hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (pythonAtLeast "3.10") [
|
||||
(fetchpatch {
|
||||
# Fix TypeError: wait() got an unexpected keyword argument 'loop'
|
||||
# See https://github.com/omnilib/aioitertools/issues/84
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch";
|
||||
sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
|
||||
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
|
@ -53,7 +44,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables.";
|
||||
description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables";
|
||||
license = licenses.mit;
|
||||
homepage = "https://pypi.org/project/aioitertools/";
|
||||
maintainers = with maintainers; [ teh ];
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bandit";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA=";
|
||||
sha256 = "sha256-WHcsqVG/ESndqKKA01FUfegycgv3tcKfrDEDknmAuKY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ buildPythonPackage
|
||||
, lib
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, psutil
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -8,15 +10,25 @@ buildPythonPackage rec {
|
|||
version = "1.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228";
|
||||
hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A library to choose unique available network ports.";
|
||||
propagatedBuildInputs = [
|
||||
psutil
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"portpicker"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to choose unique available network ports";
|
||||
homepage = "https://github.com/google/python_portpicker";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ danharaj ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ danharaj ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,35 @@
|
|||
{ lib, fetchPypi, buildPythonPackage
|
||||
, importlib-metadata, importlib-resources, six, traits
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, traits
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyface";
|
||||
version = "7.4.0";
|
||||
version = "7.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s=";
|
||||
sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ];
|
||||
propagatedBuildInputs = [
|
||||
importlib-metadata
|
||||
importlib-resources
|
||||
traits
|
||||
];
|
||||
|
||||
doCheck = false; # Needs X server
|
||||
|
||||
pythonImportsCheck = [ "pyface" ];
|
||||
pythonImportsCheck = [
|
||||
"pyface"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Traits-capable windowing framework";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rstcheck";
|
||||
version = "v3.3.1";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "myint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.6.2";
|
||||
version = "5.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g=";
|
||||
sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,17 @@
|
|||
{ lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtspim";
|
||||
version = "9.1.22";
|
||||
version = "9.1.23";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.code.sf.net/p/spimsimulator/code/";
|
||||
rev = "r739";
|
||||
sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s";
|
||||
rev = "r749";
|
||||
sha256 = "0iazl7mlcilrdbw8gb98v868a8ldw2lmkn1xs8hnfvr93l6aj0rp";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cd QtSpim
|
||||
|
||||
# Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim
|
||||
sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp
|
||||
sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp
|
||||
sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp
|
||||
sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp
|
||||
|
||||
substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib
|
||||
substituteInPlace menu.cpp \
|
||||
--replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "packet";
|
||||
version = "v2.2.2";
|
||||
version = "2.2.2";
|
||||
|
||||
goPackagePath = "github.com/ebsarr/packet";
|
||||
|
||||
src = fetchgit {
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
url = "https://github.com/ebsarr/packet";
|
||||
sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.20.2";
|
||||
version = "4.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE=";
|
||||
sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE=";
|
||||
vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.300";
|
||||
version = "0.0.301";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hwFnS8GLqGS28AdBgpIn2gRCKgJQSALDVLh5QdObV6g=";
|
||||
sha256 = "sha256-UwouKnUfEcYpwtLXxwe93mHzVvj/+72FSQ0OW55oztE=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-o5c3wbETEwnQ7IH8YM0xHSCXTnWTvZ5kvqRqoA3QkGc=";
|
||||
vendorSha256 = "sha256-VKX/Wt7CQy3w4Zv51M/IF1RIPpn7nTCL1T6jJ+oxti4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pam, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "v13";
|
||||
version = "13";
|
||||
pname = "physlock";
|
||||
src = fetchFromGitHub {
|
||||
owner = "muennich";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,15 @@ rec {
|
|||
# The description needs to be overwritten for recursive types
|
||||
type = ...;
|
||||
|
||||
# Utility functions for convenience, or special interactions with the
|
||||
# format (optional)
|
||||
lib = {
|
||||
exampleFunction = ...
|
||||
# Types specific to the format (optional)
|
||||
types = { ... };
|
||||
...
|
||||
};
|
||||
|
||||
# generate :: Name -> Value -> Path
|
||||
# A function for generating a file with a value of such a type
|
||||
generate = ...;
|
||||
|
|
@ -147,4 +156,202 @@ rec {
|
|||
'';
|
||||
|
||||
};
|
||||
|
||||
/* For configurations of Elixir project, like config.exs or runtime.exs
|
||||
|
||||
Most Elixir project are configured using the [Config] Elixir DSL
|
||||
|
||||
Since Elixir has more types than Nix, we need a way to map Nix types to
|
||||
more than 1 Elixir type. To that end, this format provides its own library,
|
||||
and its own set of types.
|
||||
|
||||
To be more detailed, a Nix attribute set could correspond in Elixir to a
|
||||
[Keyword list] (the more common type), or it could correspond to a [Map].
|
||||
|
||||
A Nix string could correspond in Elixir to a [String] (also called
|
||||
"binary"), an [Atom], or a list of chars (usually discouraged).
|
||||
|
||||
A Nix array could correspond in Elixir to a [List] or a [Tuple].
|
||||
|
||||
Some more types exists, like records, regexes, but since they are less used,
|
||||
we can leave the `mkRaw` function as an escape hatch.
|
||||
|
||||
For more information on how to use this format in modules, please refer to
|
||||
the Elixir section of the Nixos documentation.
|
||||
|
||||
TODO: special Elixir values doesn't show up nicely in the documentation
|
||||
|
||||
[Config]: <https://hexdocs.pm/elixir/Config.html>
|
||||
[Keyword list]: <https://hexdocs.pm/elixir/Keyword.html>
|
||||
[Map]: <https://hexdocs.pm/elixir/Map.html>
|
||||
[String]: <https://hexdocs.pm/elixir/String.html>
|
||||
[Atom]: <https://hexdocs.pm/elixir/Atom.html>
|
||||
[List]: <https://hexdocs.pm/elixir/List.html>
|
||||
[Tuple]: <https://hexdocs.pm/elixir/Tuple.html>
|
||||
*/
|
||||
elixirConf = { elixir ? pkgs.elixir }:
|
||||
with lib; let
|
||||
toElixir = value: with builtins;
|
||||
if value == null then "nil" else
|
||||
if value == true then "true" else
|
||||
if value == false then "false" else
|
||||
if isInt value || isFloat value then toString value else
|
||||
if isString value then string value else
|
||||
if isAttrs value then attrs value else
|
||||
if isList value then list value else
|
||||
abort "formats.elixirConf: should never happen (value = ${value})";
|
||||
|
||||
escapeElixir = escape [ "\\" "#" "\"" ];
|
||||
string = value: "\"${escapeElixir value}\"";
|
||||
|
||||
attrs = set:
|
||||
if set ? _elixirType then specialType set
|
||||
else
|
||||
let
|
||||
toKeyword = name: value: "${name}: ${toElixir value}";
|
||||
keywordList = concatStringsSep ", " (mapAttrsToList toKeyword set);
|
||||
in
|
||||
"[" + keywordList + "]";
|
||||
|
||||
listContent = values: concatStringsSep ", " (map toElixir values);
|
||||
|
||||
list = values: "[" + (listContent values) + "]";
|
||||
|
||||
specialType = { value, _elixirType }:
|
||||
if _elixirType == "raw" then value else
|
||||
if _elixirType == "atom" then value else
|
||||
if _elixirType == "map" then elixirMap value else
|
||||
if _elixirType == "tuple" then tuple value else
|
||||
abort "formats.elixirConf: should never happen (_elixirType = ${_elixirType})";
|
||||
|
||||
elixirMap = set:
|
||||
let
|
||||
toEntry = name: value: "${toElixir name} => ${toElixir value}";
|
||||
entries = concatStringsSep ", " (mapAttrsToList toEntry set);
|
||||
in
|
||||
"%{${entries}}";
|
||||
|
||||
tuple = values: "{${listContent values}}";
|
||||
|
||||
toConf = values:
|
||||
let
|
||||
keyConfig = rootKey: key: value:
|
||||
"config ${rootKey}, ${key}, ${toElixir value}";
|
||||
keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values;
|
||||
rootConfigs = flatten (mapAttrsToList keyConfigs values);
|
||||
in
|
||||
''
|
||||
import Config
|
||||
|
||||
${concatStringsSep "\n" rootConfigs}
|
||||
'';
|
||||
in
|
||||
{
|
||||
type = with lib.types; let
|
||||
valueType = nullOr
|
||||
(oneOf [
|
||||
bool
|
||||
int
|
||||
float
|
||||
str
|
||||
(attrsOf valueType)
|
||||
(listOf valueType)
|
||||
]) // {
|
||||
description = "Elixir value";
|
||||
};
|
||||
in
|
||||
attrsOf (attrsOf (valueType));
|
||||
|
||||
lib =
|
||||
let
|
||||
mkRaw = value: {
|
||||
inherit value;
|
||||
_elixirType = "raw";
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
inherit mkRaw;
|
||||
|
||||
/* Fetch an environment variable at runtime, with optional fallback
|
||||
*/
|
||||
mkGetEnv = { envVariable, fallback ? null }:
|
||||
mkRaw "System.get_env(${toElixir envVariable}, ${toElixir fallback})";
|
||||
|
||||
/* Make an Elixir atom.
|
||||
|
||||
Note: lowercase atoms still need to be prefixed by ':'
|
||||
*/
|
||||
mkAtom = value: {
|
||||
inherit value;
|
||||
_elixirType = "atom";
|
||||
};
|
||||
|
||||
/* Make an Elixir tuple out of a list.
|
||||
*/
|
||||
mkTuple = value: {
|
||||
inherit value;
|
||||
_elixirType = "tuple";
|
||||
};
|
||||
|
||||
/* Make an Elixir map out of an attribute set.
|
||||
*/
|
||||
mkMap = value: {
|
||||
inherit value;
|
||||
_elixirType = "map";
|
||||
};
|
||||
|
||||
/* Contains Elixir types. Every type it exports can also be replaced
|
||||
by raw Elixir code (i.e. every type is `either type rawElixir`).
|
||||
|
||||
It also reexports standard types, wrapping them so that they can
|
||||
also be raw Elixir.
|
||||
*/
|
||||
types = with lib.types; let
|
||||
isElixirType = type: x: (x._elixirType or "") == type;
|
||||
|
||||
rawElixir = mkOptionType {
|
||||
name = "rawElixir";
|
||||
description = "raw elixir";
|
||||
check = isElixirType "raw";
|
||||
};
|
||||
|
||||
elixirOr = other: either other rawElixir;
|
||||
in
|
||||
{
|
||||
inherit rawElixir elixirOr;
|
||||
|
||||
atom = elixirOr (mkOptionType {
|
||||
name = "elixirAtom";
|
||||
description = "elixir atom";
|
||||
check = isElixirType "atom";
|
||||
});
|
||||
|
||||
tuple = elixirOr (mkOptionType {
|
||||
name = "elixirTuple";
|
||||
description = "elixir tuple";
|
||||
check = isElixirType "tuple";
|
||||
});
|
||||
|
||||
map = elixirOr (mkOptionType {
|
||||
name = "elixirMap";
|
||||
description = "elixir map";
|
||||
check = isElixirType "map";
|
||||
});
|
||||
# Wrap standard types, since anything in the Elixir configuration
|
||||
# can be raw Elixir
|
||||
} // lib.mapAttrs (_name: type: elixirOr type) lib.types;
|
||||
};
|
||||
|
||||
generate = name: value: pkgs.runCommandNoCC name
|
||||
{
|
||||
value = toConf value;
|
||||
passAsFile = [ "value" ];
|
||||
nativeBuildInputs = [ elixir ];
|
||||
} ''
|
||||
cp "$valuePath" "$out"
|
||||
mix format "$out"
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ readline libssh ];
|
||||
|
||||
patches = [
|
||||
(./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")
|
||||
./dont-create-sysconfdir-2.patch
|
||||
(fetchurl {
|
||||
url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch";
|
||||
sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ=";
|
||||
})
|
||||
];
|
||||
|
||||
CPP="${stdenv.cc.targetPrefix}cpp -E";
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
--- a/tools/Makefile.in
|
||||
+++ b/tools/Makefile.in
|
||||
@@ -68,2 +68,2 @@
|
||||
install: all
|
||||
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
|
||||
+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
|
||||
|
|
@ -4,17 +4,16 @@
|
|||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
version = "v2.3.0";
|
||||
buildGoPackage rec {
|
||||
pname = "pebble";
|
||||
in buildGoPackage {
|
||||
inherit pname version;
|
||||
version = "2.3.0";
|
||||
|
||||
goPackagePath = "github.com/letsencrypt/${pname}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letsencrypt";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapdragon-profiler";
|
||||
version = "v2021.2";
|
||||
version = "2021.2";
|
||||
|
||||
src = archive;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "structure-synth";
|
||||
version = "v1.5";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip";
|
||||
url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip";
|
||||
sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.0";
|
||||
pname = "davix";
|
||||
pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
|
||||
nativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
# "please ignore the GitHub-generated tarballs, as they are incomplete"
|
||||
# https://github.com/cern-fts/davix/releases/tag/R_0_8_0
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz";
|
||||
url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz";
|
||||
sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,17 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage {
|
||||
pname = "pcstat-unstable";
|
||||
version = "2017-05-28";
|
||||
|
||||
goPackagePath = "github.com/tobert/pcstat";
|
||||
buildGoModule rec {
|
||||
pname = "pcstat";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "91a7346e5b462a61e876c0574cb1ba331a6a5ac5";
|
||||
owner = "tobert";
|
||||
repo = "pcstat";
|
||||
sha256 = "88853e42d16c05e580af4fb8aa815a84ea0fc43e3a25e19c85e649a5f5a2874c";
|
||||
owner = "tobert";
|
||||
repo = "pcstat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rN6oqhvrzMBhwNLm8+r4rZWZYZUhOq2h764KVhSycNo=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-1y6rzarkFNX8G4E9FzCLfWxULbdNYK3DeelNCJ+7Y9Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Page Cache stat: get page cache stats for files on Linux";
|
||||
|
|
|
|||
11
pkgs/tools/system/pcstat/deps.nix
generated
11
pkgs/tools/system/pcstat/deps.nix
generated
|
|
@ -1,11 +0,0 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "d38bf781f16e180a1b2ad82697d2f81d7b7ecfac";
|
||||
sha256 = "0eedd518ab68c6dfd431a41709d9888bbc13ed31ff64d69dcbd947442b3aaa04";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diffr";
|
||||
version = "v0.1.4";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mookid";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gawk";
|
||||
pname = "gawk" + lib.optionalString interactive "-interactive";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# enable any extra features.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dblatex";
|
||||
pname = "dblatex${lib.optionalString enableAllFeatures "-full"}";
|
||||
version = "0.3.12";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -4074,7 +4074,7 @@ with pkgs;
|
|||
|
||||
davix = callPackage ../tools/networking/davix { };
|
||||
|
||||
davix-copy = appendToName "copy" (davix.override { enableThirdPartyCopy = true; });
|
||||
davix-copy = davix.override { enableThirdPartyCopy = true; };
|
||||
|
||||
cantata = libsForQt5.callPackage ../applications/audio/cantata { };
|
||||
|
||||
|
|
@ -5686,8 +5686,7 @@ with pkgs;
|
|||
};
|
||||
gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {};
|
||||
|
||||
gawkInteractive = appendToName "interactive"
|
||||
(gawk.override { interactive = true; });
|
||||
gawkInteractive = gawk.override { interactive = true; };
|
||||
|
||||
gawp = callPackage ../tools/misc/gawp { };
|
||||
|
||||
|
|
@ -8090,9 +8089,9 @@ with pkgs;
|
|||
hdf5 = hdf5.override { usev110Api = true; };
|
||||
};
|
||||
|
||||
netcdf-mpi = appendToName "mpi" (netcdf.override {
|
||||
netcdf-mpi = netcdf.override {
|
||||
hdf5 = hdf5-mpi.override { usev110Api = true; };
|
||||
});
|
||||
};
|
||||
|
||||
netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
|
||||
|
||||
|
|
@ -15771,9 +15770,7 @@ with pkgs;
|
|||
texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop
|
||||
texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
|
||||
texinfo = texinfo6;
|
||||
texinfoInteractive = appendToName "interactive" (
|
||||
texinfo.override { interactive = true; }
|
||||
);
|
||||
texinfoInteractive = texinfo.override { interactive = true; };
|
||||
|
||||
texi2html = callPackage ../development/tools/misc/texi2html { };
|
||||
|
||||
|
|
@ -17291,9 +17288,7 @@ with pkgs;
|
|||
|
||||
highfive = callPackage ../development/libraries/highfive { };
|
||||
|
||||
highfive-mpi = appendToName "mpi" (highfive.override {
|
||||
hdf5 = hdf5-mpi;
|
||||
});
|
||||
highfive-mpi = highfive.override { hdf5 = hdf5-mpi; };
|
||||
|
||||
hiredis = callPackage ../development/libraries/hiredis { };
|
||||
|
||||
|
|
@ -20175,7 +20170,7 @@ with pkgs;
|
|||
|
||||
sqlitecpp = callPackage ../development/libraries/sqlitecpp { };
|
||||
|
||||
sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
|
||||
sqlite-interactive = (sqlite.override { interactive = true; }).bin;
|
||||
|
||||
sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
|
||||
|
||||
|
|
@ -22420,6 +22415,8 @@ with pkgs;
|
|||
|
||||
gmailctl = callPackage ../applications/networking/gmailctl { };
|
||||
|
||||
gometer = callPackage ../applications/misc/gometer { };
|
||||
|
||||
gomp = callPackage ../applications/version-management/gomp { };
|
||||
|
||||
gomplate = callPackage ../development/tools/gomplate {};
|
||||
|
|
@ -23602,6 +23599,8 @@ with pkgs;
|
|||
inherit (nodePackages) svgo;
|
||||
};
|
||||
|
||||
emojipick = callPackage ../applications/misc/emojipick { };
|
||||
|
||||
encode-sans = callPackage ../data/fonts/encode-sans { };
|
||||
|
||||
envypn-font = callPackage ../data/fonts/envypn-font
|
||||
|
|
@ -27319,7 +27318,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; });
|
||||
mercurialFull = mercurial.override { fullBuild = true; };
|
||||
|
||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
|
|
@ -27710,6 +27709,8 @@ with pkgs;
|
|||
|
||||
pijuice = with python3Packages; toPythonApplication pijuice;
|
||||
|
||||
pinegrow = callPackage ../applications/editors/pinegrow { };
|
||||
|
||||
ping = callPackage ../applications/networking/ping { };
|
||||
|
||||
piper = callPackage ../os-specific/linux/piper { };
|
||||
|
|
@ -31821,12 +31822,12 @@ with pkgs;
|
|||
octopus = callPackage ../applications/science/chemistry/octopus { };
|
||||
|
||||
openlp = libsForQt5.callPackage ../applications/misc/openlp { };
|
||||
openlpFull = appendToName "full" (openlp.override {
|
||||
openlpFull = openlp.override {
|
||||
pdfSupport = true;
|
||||
presentationSupport = true;
|
||||
vlcSupport = true;
|
||||
gstreamerSupport = true;
|
||||
});
|
||||
};
|
||||
|
||||
dkh = callPackage ../applications/science/chemistry/dkh { };
|
||||
|
||||
|
|
@ -31978,13 +31979,9 @@ with pkgs;
|
|||
|
||||
n3 = callPackage ../applications/science/biology/N3 { };
|
||||
|
||||
neuron = callPackage ../applications/science/biology/neuron {
|
||||
python = null;
|
||||
};
|
||||
neuron = callPackage ../applications/science/biology/neuron { python = null; };
|
||||
|
||||
neuron-mpi = appendToName "mpi" (neuron.override {
|
||||
useMpi = true;
|
||||
});
|
||||
neuron-mpi = neuron.override {useMpi = true; };
|
||||
|
||||
neuron-full = neuron-mpi.override { python = python2; };
|
||||
|
||||
|
|
@ -32034,9 +32031,7 @@ with pkgs;
|
|||
|
||||
raxml = callPackage ../applications/science/biology/raxml { };
|
||||
|
||||
raxml-mpi = appendToName "mpi" (raxml.override {
|
||||
useMpi = true;
|
||||
});
|
||||
raxml-mpi = raxml.override { useMpi = true; };
|
||||
|
||||
sambamba = callPackage ../applications/science/biology/sambamba { };
|
||||
|
||||
|
|
@ -33015,13 +33010,9 @@ with pkgs;
|
|||
|
||||
dbacl = callPackage ../tools/misc/dbacl { };
|
||||
|
||||
dblatex = callPackage ../tools/typesetting/tex/dblatex {
|
||||
enableAllFeatures = false;
|
||||
};
|
||||
dblatex = callPackage ../tools/typesetting/tex/dblatex { };
|
||||
|
||||
dblatexFull = appendToName "full" (dblatex.override {
|
||||
enableAllFeatures = true;
|
||||
});
|
||||
dblatexFull = dblatex.override { enableAllFeatures = true; };
|
||||
|
||||
dbus-map = callPackage ../tools/misc/dbus-map { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue