From 5a85302190a2894e51e7447d9924622b1b00479e Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 8 Feb 2022 07:05:19 +0000 Subject: [PATCH 01/43] qtspim: 9.1.22 -> 9.1.23 --- pkgs/development/tools/misc/qtspim/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 842cf0eb5b4..7329ad50967 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -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 \ From 97e4ab5ee8575d8bb2f3d3ec6e1daf1473b61a4b Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Fri, 11 Feb 2022 18:26:55 +0100 Subject: [PATCH 02/43] nerd-font-patcher: use upstream repo with sparseCheckout --- .../misc/nerd-font-patcher/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index 6807cd9024f..ac3fa9200a7 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -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 ]; From 00e569b437ddb0538cd445ca481ef6e48b170937 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 08:15:51 +0000 Subject: [PATCH 03/43] python310Packages.pyface: 7.4.0 -> 7.4.1 --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index aafd60c0dba..4c15dd6d4af 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.4.0"; + version = "7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s="; + sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; }; propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; From 97e38be9f68ee4fc04413bc71ed9dfbefda98aa6 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 25 Feb 2022 13:34:32 -0600 Subject: [PATCH 04/43] gometer: init at 5.2.0 --- pkgs/applications/misc/gometer/default.nix | 47 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/misc/gometer/default.nix diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix new file mode 100644 index 00000000000..9b335b1aeda --- /dev/null +++ b/pkgs/applications/misc/gometer/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8d9ec44fc..d69795d0be0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22391,6 +22391,8 @@ with pkgs; gmailctl = callPackage ../applications/networking/gmailctl { }; + gometer = callPackage ../applications/misc/gometer { }; + gomp = callPackage ../applications/version-management/gomp { }; gomplate = callPackage ../development/tools/gomplate {}; From 8a6b41d271d0266e50084bb8422d8f2207868045 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 26 Feb 2022 12:49:48 +0100 Subject: [PATCH 05/43] signald: 0.15.0 -> 0.17.0 ChangeLogs: * https://gitlab.com/signald/signald/-/tags/0.16.0 * https://gitlab.com/signald/signald/-/tags/0.16.1 * https://gitlab.com/signald/signald/-/tags/0.17.0 --- ...g-during-gradle-build-inside-Nix-FOD.patch | 35 +++++++++++ .../0002-buildconfig-local-deps-fixes.patch | 60 +++++++++++++++++++ .../instant-messengers/signald/default.nix | 39 ++++-------- .../signald/gradle-plugin.patch | 19 ------ 4 files changed, 107 insertions(+), 46 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch create mode 100644 pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch delete mode 100644 pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch new file mode 100644 index 00000000000..e23aded6d0e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -0,0 +1,35 @@ +From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +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 + diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch new file mode 100644 index 00000000000..c5931238fe5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -0,0 +1,60 @@ +From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +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 + diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index e75c2357b28..3f84c156f82 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -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" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch deleted file mode 100644 index fec988a94e7..00000000000 --- a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch +++ /dev/null @@ -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' From 4ec18cd57e29e4e426875cb7e86591a0083faad7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 27 Feb 2022 10:55:42 +0800 Subject: [PATCH 06/43] bamf: 0.5.5 -> 0.5.6 --- pkgs/development/libraries/bamf/default.nix | 32 ++++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 406ff81fe8e..96b677b27b5 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -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 = '' From c25c096d614f011fdd6abade39ef2d7ba1764054 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 27 Feb 2022 14:51:45 +0800 Subject: [PATCH 07/43] bird: add patch for babel iface reconfiguration --- pkgs/servers/bird/default.nix | 6 +++++- pkgs/servers/bird/dont-create-sysconfdir-1.patch | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 pkgs/servers/bird/dont-create-sysconfdir-1.patch diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 34d1aab3286..5c5fec3d892 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -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"; diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch deleted file mode 100644 index 8f62670aee9..00000000000 --- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch +++ /dev/null @@ -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) From 4cf4214c7a170d68816e7cf59b3d1f54fb273dc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 05:37:11 +0000 Subject: [PATCH 08/43] flyctl: 0.0.300 -> 0.0.301 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2ab433d79b6..7de71132d6a 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -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; From 77aa81cbfda5dda3ba1d2bb49eb38e21a7e1b8df Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 28 Feb 2022 09:12:45 +0100 Subject: [PATCH 09/43] python3Packages.aioitertools: update and remove python 3.10 patch --- .../python-modules/aioitertools/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index cae0b10ea69..aa2987b1baf 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -17,25 +17,16 @@ 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"; + sha256 = "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 ]; From 0432d5f1dad88c0510386c60c3b9e3ad43f34081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 08:37:42 +0000 Subject: [PATCH 10/43] jwm: 2.4.0 -> 2.4.1 --- pkgs/applications/window-managers/jwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 2c9461d6388..8a9b72265b9 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -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 ]; From 60779b767755bd28a0839d9742cf770e199c59f7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 18 Feb 2022 16:48:15 +0100 Subject: [PATCH 11/43] pcstat: 2017-05-28 -> 0.0.1 Also switch to buildGoModule. --- pkgs/tools/system/pcstat/default.nix | 20 +++++++++----------- pkgs/tools/system/pcstat/deps.nix | 11 ----------- 2 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 pkgs/tools/system/pcstat/deps.nix diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index d01b08a1434..02a214259c7 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -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"; diff --git a/pkgs/tools/system/pcstat/deps.nix b/pkgs/tools/system/pcstat/deps.nix deleted file mode 100644 index 809bde1122f..00000000000 --- a/pkgs/tools/system/pcstat/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d38bf781f16e180a1b2ad82697d2f81d7b7ecfac"; - sha256 = "0eedd518ab68c6dfd431a41709d9888bbc13ed31ff64d69dcbd947442b3aaa04"; - }; - } -] From 2f618b1abdf4693007c5910f3756b8c41c0aa26f Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 28 Feb 2022 11:04:16 +0100 Subject: [PATCH 12/43] correct typing_extensions error --- pkgs/development/python-modules/aioitertools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index aa2987b1baf..289d1ae1630 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; From 107c75bc486ff527b73f74df072a893be3ff79b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 11:33:36 +0100 Subject: [PATCH 13/43] python3Packages.pyface: disable on older Python releases --- .../python-modules/pyface/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 4c15dd6d4af..d10e20eb0b2 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -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.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; 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"; From ba549fc0b99546fa7a3f442a333b8a638177e2fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 11:56:20 +0100 Subject: [PATCH 14/43] python3Packages.portpicker: fix build - add pythonImportsCheck --- .../python-modules/portpicker/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index fd7bf7bc09c..faf3b958162 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -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 ]; }; } From 807cf78f4bbf2aeb72753be46d40b99f4f69878d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Feb 2022 12:01:19 +0100 Subject: [PATCH 15/43] yq-go: 4.20.2 -> 4.21.1 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 483523e1807..bfe18fc4758 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -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; From 39db09d87bc478ca14cdce86bbfaf6977bb88309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Feb 2022 12:02:07 +0100 Subject: [PATCH 16/43] python39Packages.bandit: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/bandit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 4a2a2803d3a..0fcf5966d68 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -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 = [ From c0952b6478194c01081d338b46402803cbfd14a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 18 Feb 2022 21:28:37 +0100 Subject: [PATCH 17/43] chromium{Beta,Dev}: Switch to LLVM 14 This fixes the following build error: [24751/48400] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.js.mojom-webui.jsui.js FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc make_top_domain_list_variables failed with exit code -4 The "make_top_domain_list_variables" program fails due to a SIGILL error (illegal instruction). See: - https://bugs.chromium.org/p/chromium/issues/detail?id=1273966 - https://reviews.llvm.org/D115015 - https://bugs.chromium.org/p/chromium/issues/detail?id=1269407 --- pkgs/applications/networking/browsers/chromium/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 53762744504..084db58f38b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 { From 1bdf7862e3f8007cdb21bbbde1d496064f869bb3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Feb 2022 20:30:43 +0100 Subject: [PATCH 18/43] chromiumBeta: Fix the build This "fixes" the following error: gen/shim_headers/opus_shim/third_party/opus/src/include/opus.h:5:10: error: 'opus.h' file not found with include; use "quotes" instead ^~~~~~~~ "opus.h" Our system library isn't discovered anymore so I'm switching to the bundled Opus library for now since I don't have time to look into it. --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c377c0ab207..0eb1893e95c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,7 +96,7 @@ let "libpng" "libwebp" "libxslt" - "opus" + # "opus" ]; opusWithCustomModes = libopus.override { From 3bce8227a0019104590dfab07d527f7493a9e1f6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Feb 2022 12:31:39 +0100 Subject: [PATCH 19/43] llvmPackages_14.lld: Update fix-root-src-dir.patch to fix the build --- .../compilers/llvm/14/lld/fix-root-src-dir.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch index 26ecef25649..38fb965b472 100644 --- a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch +++ b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -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) From 19d43bf8f6c83e9c0601b3bbb4a9833fb318f3cf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 22:53:07 +0100 Subject: [PATCH 20/43] davix-copy: remove appendToName to have a consistent package name for repology --- pkgs/tools/networking/davix/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 66c912b47f1..63fc1cffd9a 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -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="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5368a4a5678..c968bad82a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4069,7 +4069,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 { }; From 564b9a825297d85a9c7a2c48d28a457ba1f2aa63 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 22:54:09 +0100 Subject: [PATCH 21/43] gawkInteractive: remove appendToName to have a consistent package name for repology --- pkgs/tools/text/gawk/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index d66d3763c03..3f91a301fd1 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c968bad82a4..af85165e4e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5681,8 +5681,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 { }; From 404e4e6be23d75a18c5dbb87f5f0beb234191f01 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 12:48:53 +0100 Subject: [PATCH 22/43] netcdf-mpi:remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/netcdf/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 71109775722..27af3be4f2d 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -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"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af85165e4e2..26f02751fc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8084,9 +8084,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 { }; From a5ee1e55a195010263778dfc846b39eb555541ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 14:30:51 +0100 Subject: [PATCH 23/43] texinfoInteractive: remove double '-interactive' name --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26f02751fc9..6b2e1689fae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15755,9 +15755,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 { }; From e8d722ff6401d5746069e519643fc4d3c0a63474 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 15:47:18 +0100 Subject: [PATCH 24/43] highfive-mpi: remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/highfive/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae5..5eb6ceb204e 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b2e1689fae..a0c96a84d74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17273,9 +17273,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 { }; From 910a9c77227375ab3186d148c68a1c5327f5fc70 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 16:15:32 +0100 Subject: [PATCH 25/43] sqlite-interactive: remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6704d894f5a..5fdf6c11d77 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0c96a84d74..b85db5723c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20155,7 +20155,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 { }; From a50f8ee4331598d431eedcc2fe0b29ae47e45b9e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:38:51 +0100 Subject: [PATCH 26/43] mercurialFull: remove appendToName to have a consistent package name for repology --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 80c2679d05c..e413ca0efe0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85db5723c0..4d42e17033d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27309,7 +27309,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 { }; From f427f5296e9923d8c73541de6ac14b6c6d969ed1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:41:45 +0100 Subject: [PATCH 27/43] openlpFull: remove appendToName to have a consistent package name for repology --- pkgs/applications/misc/openlp/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix index 1ee48256474..a075a9bec6f 100644 --- a/pkgs/applications/misc/openlp/default.nix +++ b/pkgs/applications/misc/openlp/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d42e17033d..69c3984bff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31811,12 +31811,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 { }; From 13dca33cdc43f4557ee2f53615f2dcbc8f01ac9d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:58:07 +0100 Subject: [PATCH 28/43] neuron-mpi: remove appendToName to have a consistent package name for repology --- pkgs/applications/science/biology/neuron/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 804407968e1..4dc850f5062 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c3984bff0..d149641a187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31968,13 +31968,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; }; From ea0de43b7688fe2fb63d46e9446fb9bbf3d2c946 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:59:51 +0100 Subject: [PATCH 29/43] dblatexFull: remove appendToName to have a consistent package name for repology --- pkgs/tools/typesetting/tex/dblatex/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 99ef9a8a71a..5ccc9ed1566 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d149641a187..788874a7965 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32997,13 +32997,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 { }; From fe7678ca819933bc2ac28dccf0c0e9aef04de21c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 20:18:51 +0100 Subject: [PATCH 30/43] raxml-mpi: remove appendToName to have a consistent package name for repology --- pkgs/applications/science/biology/raxml/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 6e747e318f5..d02d4726629 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -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"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788874a7965..86775d35489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32020,9 +32020,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 { }; From 844e206407208be46015620f275bc3ef86ce720f Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Feb 2022 11:57:28 +0000 Subject: [PATCH 31/43] =?UTF-8?q?n8n:=200.164.1=20=E2=86=92=200.165.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 150 ++++++++++-------- 1 file changed, 87 insertions(+), 63 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 29e3fa179df..c15e51921d4 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -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" From 1573dbdcd01293fd45fec86ea0f35008b5924d0d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Feb 2022 12:35:10 +0100 Subject: [PATCH 32/43] treewide: fix versions starting with 'v' --- pkgs/applications/audio/plujain-ramp/default.nix | 2 +- pkgs/applications/science/chemistry/d-seams/default.nix | 4 ++-- pkgs/development/libraries/ngt/default.nix | 2 +- pkgs/development/libraries/rang/default.nix | 8 ++++---- pkgs/development/python-modules/rstcheck/default.nix | 4 ++-- pkgs/development/tools/packet/default.nix | 4 ++-- pkgs/misc/screensavers/physlock/default.nix | 4 ++-- pkgs/tools/admin/pebble/default.nix | 9 ++++----- pkgs/tools/graphics/snapdragon-profiler/default.nix | 2 +- pkgs/tools/graphics/structure-synth/default.nix | 7 +++---- pkgs/tools/text/diffr/default.nix | 4 ++-- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix index 56f4d6da050..d8f5357efdb 100644 --- a/pkgs/applications/audio/plujain-ramp/default.nix +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - version = "v1.1.3"; + version = "1.1.3"; pname = "plujain-ramp"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index f5e21db4b55..74260bacabc 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -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"; }; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 385f2d84f8a..e42ee750cc0 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index 79ab52fc835..050beef5ea3 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -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; { diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index d109a6cce74..606b2879908 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -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="; }; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 723e5d8bb2d..173ff4770da 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -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"; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index d25a777e650..b5e9ba8d2b6 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -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"; }; diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 1fb902a8c80..436e77ed5f1 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -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"; }; diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index 298975ef18b..b48c0a6d16a 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "snapdragon-profiler"; - version = "v2021.2"; + version = "2021.2"; src = archive; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 5f6e655882a..ab32657236a 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -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"; }; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index a77a5dc081e..844a09f0d58 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -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"; }; From 6a96ddb67509064c2d445b3fae73d4c4c38c539d Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 10 Apr 2021 16:04:35 +0200 Subject: [PATCH 33/43] pkgs-lib: Implement settings format for Elixir --- .../development/settings-options.section.md | 45 ++++ .../development/settings-options.section.xml | 104 +++++++++ pkgs/pkgs-lib/formats.nix | 207 ++++++++++++++++++ 3 files changed, 356 insertions(+) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 58a3d8448af..f9bb6ff9cc4 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -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 diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml index c9430b77579..746011a2d07 100644 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ b/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -137,6 +137,97 @@ + + + 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. + + + 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 + + + + + + These functions all return an attribute set with these values: @@ -152,6 +243,19 @@ + + + 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 diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 5e17519d4ce..495a7094f9b 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -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]: + [Keyword list]: + [Map]: + [String]: + [Atom]: + [List]: + [Tuple]: + */ + 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" + ''; + }; + } From 53e70ab75490df87a165d704a9e98312b3f5137b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 10 Apr 2021 17:37:58 +0200 Subject: [PATCH 34/43] maintainers/teams: add minijackson to the beam team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c586254d709..4e410b5914e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -50,6 +50,7 @@ with lib.maintainers; { DianaOlympos gleber happysalada + minijackson yurrriq ]; scope = "Maintain BEAM-related packages and modules."; From ab34433bc0dcdf9b3cfbc8bb187030920b4c0e7b Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 28 Feb 2022 13:18:39 +0100 Subject: [PATCH 35/43] emojipick: init at 2021-01-27 (#158187) --- pkgs/applications/misc/emojipick/default.nix | 71 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/misc/emojipick/default.nix diff --git a/pkgs/applications/misc/emojipick/default.nix b/pkgs/applications/misc/emojipick/default.nix new file mode 100644 index 00000000000..9c28c98bf04 --- /dev/null +++ b/pkgs/applications/misc/emojipick/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5368a4a5678..3544f1f0be5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23601,6 +23601,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 From 6aad44741e2d7ad36945b52d2ae56de8977aa6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:53:28 -0300 Subject: [PATCH 36/43] whitesur-gtk-theme: 2021-12-28 -> 2022-02-21 --- pkgs/data/themes/whitesur/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 6833f473664..afc9f2282d9 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ 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 = [ From 612d007dc552d098e3c7c9b28b70f20edb30ba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:55:53 -0300 Subject: [PATCH 37/43] whitesur-gtk-theme: add optional arguments --- pkgs/data/themes/whitesur/default.nix | 33 ++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index afc9f2282d9..92bfbd0dd26 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -7,8 +7,28 @@ , 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 = "2022-02-21"; @@ -48,8 +68,19 @@ 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 + runHook postInstall ''; From c37327d82dbf1e395e7d41922ef33b37bbcedaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:56:34 -0300 Subject: [PATCH 38/43] whitesur-gtk-theme: replace duplicate files with links --- pkgs/data/themes/whitesur/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 92bfbd0dd26..825772880d6 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -4,6 +4,7 @@ , glib , gnome-shell , gnome-themes-extra +, jdupes , libxml2 , sassc , util-linux @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib gnome-shell + jdupes libxml2 sassc util-linux @@ -81,6 +83,8 @@ stdenv.mkDerivation rec { ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ --dest $out/share/themes + jdupes --link-soft --recurse $out/share + runHook postInstall ''; From 9d821edfd11c53fa5970c895eb404ac794c53d52 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 28 Feb 2022 14:27:59 +0100 Subject: [PATCH 39/43] pinegrow: init at 6.3 (#157304) Co-authored-by: Sandro --- .../applications/editors/pinegrow/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/applications/editors/pinegrow/default.nix diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix new file mode 100644 index 00000000000..8ddd0d6a283 --- /dev/null +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c49100ae61c..e147dd37161 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27702,6 +27702,8 @@ with pkgs; pijuice = with python3Packages; toPythonApplication pijuice; + pinegrow = callPackage ../applications/editors/pinegrow { }; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; From 1507783b7f1e4fba85c7f6707dc40bd8b19c7b7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 13:40:49 +0000 Subject: [PATCH 40/43] nextcloud-client: 3.4.2 -> 3.4.3 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 04e6e3fb438..3a63f98c44c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -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 = [ From 3abcc5b5e0fb96a39908f67e77bd69c901c527b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Feb 2022 14:38:08 +0100 Subject: [PATCH 41/43] radare2: 5.6.2 -> 5.6.4 --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1bef8cd0758..d5d393ee96e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -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 = '' From f37471be4ce3d61a9dddd254aa2c868d03643956 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 14:47:57 +0100 Subject: [PATCH 42/43] python3Packages.aioitertools: update meta --- pkgs/development/python-modules/aioitertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 289d1ae1630..451fb9e7fa1 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; nativeBuildInputs = [ @@ -44,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 ]; From 44174de622d458623d5042c756c8d7cb351d9a78 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 28 Feb 2022 10:09:21 -0600 Subject: [PATCH 43/43] agave: 35 -> 37 (#157536) bold variant (basics covered) slashed variant available but uses same name --- pkgs/data/fonts/agave/default.nix | 33 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 39ef6e34aaa..d2ecda3a111 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -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";