diff options
65 files changed, 404 insertions, 313 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 57aef50a0f6ba..fb5d3ba473255 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -51,7 +51,9 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { $n++; $rootDir = $ARGV[$n]; die "$0: ‘--root’ requires an argument\n" unless defined $rootDir; + die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/"; $rootDir =~ s/\/*$//; # remove trailing slashes + $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path } elsif ($arg eq "--force") { $force = 1; @@ -616,7 +618,12 @@ EOF if ($showHardwareConfig) { print STDOUT $hwConfig; } else { - $outDir = "$rootDir$outDir"; + if ($outDir eq "/etc/nixos") { + $outDir = "$rootDir$outDir"; + } else { + $outDir = File::Spec->rel2abs($outDir); + $outDir =~ s/\/*$//; # remove trailing slashes + } my $fn = "$outDir/hardware-configuration.nix"; print STDERR "writing $fn...\n"; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index ea7fc13757472..45fedadee309f 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: @@ -6,10 +6,11 @@ stdenv.mkDerivation { version = "0.2.1"; pname = "lightdm-enso-os-greeter"; - src = fetchgit { - url = "https://github.com/nick92/Enso-OS"; + src = fetchFromGitHub { + owner = "nick92"; + repo = "Enso-OS"; rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; - sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; + sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY="; }; patches = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 20bb0efdd6637..2873be1787fa1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -1,11 +1,12 @@ let pkgs = import ../../../../.. { }; - src = pkgs.fetchgit { - url = "https://github.com/nix-community/emacs2nix.git"; - fetchSubmodules = true; + src = pkgs.fetchFromGitHub { + owner = "nix-community"; + repo = "emacs2nix"; rev = "2e8d2c644397be57455ad32c2849f692eeac7797"; sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M="; + fetchSubmodules = true; }; in pkgs.mkShell { diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index f31b79c9ddf41..105728b7f044e 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mop"; version = "0.2.0"; - rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; + + src = fetchFromGitHub { + owner = "mop-tracker"; + repo = "mop"; + rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; + sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4="; + }; goPackagePath = "github.com/michaeldv/mop"; goDeps = ./deps.nix; @@ -16,12 +22,6 @@ buildGoPackage rec { mv cmd mop ''; - src = fetchgit { - inherit rev; - url = "https://github.com/mop-tracker/mop"; - sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx"; - }; - meta = with lib; { description = "Simple stock tracker implemented in go"; homepage = "https://github.com/mop-tracker/mop"; diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch new file mode 100644 index 0000000000000..26ed3aec9fb71 --- /dev/null +++ b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch @@ -0,0 +1,25 @@ +From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Tue, 8 Mar 2022 23:59:19 +0100 +Subject: [PATCH 1/2] Use command -v in favor of which + +--- + Makerules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makerules b/Makerules +index 0fdaecb..6d52cca 100644 +--- a/Makerules ++++ b/Makerules +@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) + LD = xcrun ld + RANLIB = xcrun ranlib + +- ifeq (, $(shell which pkg-config)) ++ ifeq (, $(shell command -v pkg-config)) + $(warning "No pkg-config found, install it for proper integration of libcrypto") + else + HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch b/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch new file mode 100644 index 0000000000000..2fe1a4afd9fd2 --- /dev/null +++ b/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch @@ -0,0 +1,57 @@ +From 0f0ccfc01cfe72d96eafee57ec6c5107f09c7238 Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Wed, 9 Mar 2022 00:08:28 +0100 +Subject: [PATCH 2/2] Add Darwin deps + +--- + Makerules | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/Makerules b/Makerules +index 6d52cca..a6bd0ed 100644 +--- a/Makerules ++++ b/Makerules +@@ -153,6 +153,40 @@ else ifeq ($(OS),MACOS) + LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO + LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + endif ++ # Required for mupdf-gl ++ ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) ++ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ endif ++ ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) ++ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ endif ++ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) ++ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ endif ++ ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) ++ SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) ++ SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) ++ endif ++ # Required for mupdf-x11 ++ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) ++ ifeq ($(HAVE_X11),yes) ++ X11_CFLAGS := $(shell pkg-config --cflags x11 xext) ++ X11_LIBS := $(shell pkg-config --libs x11 xext) ++ endif ++ # Required for mupdf-x11-curl ++ HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) ++ ifeq ($(HAVE_SYS_CURL),yes) ++ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) ++ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ endif ++ HAVE_PTHREAD := yes ++ ifeq ($(HAVE_PTHREAD),yes) ++ PTHREAD_CFLAGS := ++ PTHREAD_LIBS := -lpthread ++ endif + endif + + else ifeq ($(OS),Linux) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 7bb9a89b8b395..4877051fd9824 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , fetchpatch +, desktopToDarwinBundle , pkg-config , freetype , harfbuzz @@ -10,7 +11,7 @@ , libjpeg , darwin , gumbo -, enableX11 ? true +, enableX11 ? (!stdenv.isDarwin) , libX11 , libXext , libXi @@ -21,6 +22,7 @@ , enableGL ? true , freeglut , libGLU +, xcbuild }: let @@ -39,6 +41,10 @@ stdenv.mkDerivation rec { sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; + patches = [ ./0001-Use-command-v-in-favor-of-which.patch + ./0002-Add-Darwin-deps.patch + ]; + postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; @@ -50,8 +56,11 @@ stdenv.mkDerivation rec { ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = + [ pkg-config ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] + ++ lib.optional stdenv.isDarwin xcbuild ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 57b1b62569065..7eed625f1e900 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, electron, runtimeShell } : +{ lib, stdenv, fetchFromGitHub, electron, runtimeShell } : stdenv.mkDerivation rec { pname = "nix-tour"; @@ -6,10 +6,11 @@ stdenv.mkDerivation rec { buildInputs = [ electron ]; - src = fetchgit { - url = "https://github.com/nixcloud/tour_of_nix"; + src = fetchFromGitHub { + owner = "nixcloud"; + repo = "tour_of_nix"; rev = "v${version}"; - sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; + sha256 = "sha256-a/P2ZMc9OpM4PxRFklSO6oVCc96AGWkxtGF/EmnfYSU="; }; installPhase = '' diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index b2839a97efcce..a94363f4600cf 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }: +{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }: stdenv.mkDerivation rec { version = "0.8.1"; pname = "tpmmanager"; - src = fetchgit { - url = "https://github.com/Sirrix-AG/TPMManager"; - rev = "9f989206635a6d2c1342576c90fa73eb239519cd"; - sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e"; + src = fetchFromGitHub { + owner = "Rohde-Schwarz"; + repo = "TPMManager"; + rev = "v${version}"; + sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index 7e88a77193b6f..9b501facb7f60 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,13 +1,14 @@ -{ lib, fetchgit +{ lib, fetchFromGitHub , buildPythonApplication, buildPythonPackage , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let - mainsrc = fetchgit { - url = "https://github.com/saadnpq/matrixcli"; + mainsrc = fetchFromGitHub { + owner = "saadnpq"; + repo = "matrixcli"; rev = "61ebde173ca2f77185c261c2b7f6db297ca89863"; - sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq"; + sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU="; fetchSubmodules = true; }; @@ -35,7 +36,6 @@ let in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "matrixcli"; version = "0.0.2019-08-15"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index a168eb984c337..2c6a0c5e7e64a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, pidgin } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin } : -let - version = "54b2992"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pidgin-mra"; - inherit version; + version = "unstable-2014-07-08"; - src = fetchgit { - url = "https://github.com/dreadatour/pidgin-mra"; - rev = version; - sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; + src = fetchFromGitHub { + owner = "dreadatour"; + repo = "pidgin-mra"; + rev = "54b299266265cde800289b2d51f13b81f6bf379c"; + sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 527af9ed98db6..6f7aab564fac9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } : -let - version = "1.3.1"; -in stdenv.mkDerivation rec { pname = "telegram-purple"; - inherit version; + version = "1.3.1"; - src = fetchgit { - url = "https://github.com/majn/telegram-purple"; + src = fetchFromGitHub { + owner = "majn"; + repo = "telegram-purple"; rev = "v${version}"; - sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; + sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10="; }; NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index cb52144b0178b..568a2a5bd51b1 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, - fetchgit }: + fetchFromGitHub }: let gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { pname = "pond"; - version = "20150830-${lib.strings.substring 0 7 rev}"; - rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + version = "unstable-2015-08-30"; goPackagePath = "github.com/agl/pond"; - src = fetchgit { - inherit rev; - url = "https://github.com/agl/pond"; - sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; + src = fetchFromGitHub { + owner = "agl"; + repo = "pond"; + rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y="; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index a87d57ecc91f9..e2b4cafe99361 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -2,7 +2,7 @@ , element-desktop # for seshat and keytar , schildichat-web , stdenv -, fetchgit +, fetchFromGitHub , makeWrapper , makeDesktopItem , copyDesktopItems @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { pname = "schildichat-desktop"; inherit (pinData) version; - src = fetchgit { - url = "https://github.com/SchildiChat/schildichat-desktop/"; + src = fetchFromGitHub { + owner = "SchildiChat"; + repo = "schildichat-desktop"; inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index f9e00c06470a4..a7ad6fb4d9b1d 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -1,5 +1,5 @@ { stdenv, lib -, fetchgit +, fetchFromGitHub , fetchYarnDeps , nodejs , yarn @@ -18,8 +18,9 @@ in stdenv.mkDerivation rec { pname = "schildichat-web"; inherit (pinData) version; - src = fetchgit { - url = "https://github.com/SchildiChat/schildichat-desktop/"; + src = fetchFromGitHub { + owner = "SchildiChat"; + repo = "schildichat-desktop"; inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 2d5f6e2dfb727..cbc93857c8191 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,7 +1,7 @@ { mkDerivation , lib , stdenv -, fetchgit +, fetchFromGitHub , qtbase , qtquickcontrols , qmake @@ -15,10 +15,11 @@ mkDerivation rec { pname = "tensor"; version = "unstable-2017-02-21"; - src = fetchgit { - url = "https://github.com/davidar/tensor.git"; + src = fetchFromGitHub { + owner = "davidar"; + repo = "tensor"; rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index df7168ac308ea..c8c36049a2a40 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,13 +1,14 @@ -{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: +{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "communi"; version = "3.5.0"; - src = fetchgit { - url = "https://github.com/communi/communi-desktop.git"; + src = fetchFromGitHub { + owner = "communi"; + repo = "communi-desktop"; rev = "v${version}"; - sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji"; + sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 7113997c90f3a..c5a4e93de7850 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,35 +1,32 @@ -{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }: - -let +stdenv.mkDerivation rec { + pname = "money-manager-ex"; version = "1.3.3"; -in - stdenv.mkDerivation { - pname = "money-manager-ex"; - inherit version; - src = fetchgit { - url = "https://github.com/moneymanagerex/moneymanagerex.git"; - rev = "refs/tags/v${version}"; - sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74"; - }; + src = fetchFromGitHub { + owner = "moneymanagerex"; + repo = "moneymanagerex"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ="; + }; - nativeBuildInputs = [ - wrapGAppsHook - ]; + nativeBuildInputs = [ + wrapGAppsHook + ]; - buildInputs = [ - gettext - sqlite - wxGTK30 - wxGTK30.gtk - ]; + buildInputs = [ + gettext + sqlite + wxGTK30 + wxGTK30.gtk + ]; - meta = { - description = "Easy-to-use personal finance software"; - homepage = "https://www.moneymanagerex.org/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - }; - } + meta = { + description = "Easy-to-use personal finance software"; + homepage = "https://www.moneymanagerex.org/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index ba2225b903fa6..eb14982575a27 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false @@ -22,11 +22,12 @@ in stdenv.mkDerivation rec { pname = "CNTK"; version = "2.7"; - # Submodules - src = fetchgit { - url = "https://github.com/Microsoft/CNTK"; + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "CNTK"; rev = "v${version}"; - sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; + sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI="; + fetchSubmodules = true; }; patches = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 6d3b65547330d..c32d29f2561a2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-annex-remote-b2"; - version = "20151212-${lib.strings.substring 0 7 rev}"; - rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + version = "unstable-2015-12-12"; goPackagePath = "github.com/encryptio/git-annex-remote-b2"; - src = fetchgit { - inherit rev; - url = "https://github.com/encryptio/git-annex-remote-b2"; - sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; + src = fetchFromGitHub { + owner = "encryptio"; + repo = "git-annex-remote-b2"; + rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ="; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 7db42c71092f1..cc2489356c5de 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchgit, dtc, fetchpatch, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; version = "1.0.0"; - src = fetchgit { - url = "https://github.com/riscv/riscv-isa-sim.git"; + src = fetchFromGitHub { + owner = "riscv"; + repo = "riscv-isa-sim"; rev = "v${version}"; sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww"; }; diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index 5f107337ee448..a837c435204a0 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "btops"; @@ -7,10 +6,11 @@ buildGoPackage rec { goPackagePath = "github.com/cmschuetz/btops"; - src = fetchgit { - url = "https://github.com/cmschuetz/btops.git"; + src = fetchFromGitHub { + owner = "cmschuetz"; + repo = "btops"; rev = version; - sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq"; + sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY="; }; goDeps = ./deps.nix; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index ceed830700406..c8d8ca42f9e46 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, fontforge, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; version = "1.2.2"; - src = fetchgit { - url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; + src = fetchFromGitHub { + owner = "hakatashi"; + repo = "RictyDiminished-with-FiraCode"; rev = version; - sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p"; + sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index b3a2a44d27803..10407598fb96f 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez, chez-srfi }: +{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chez-mit"; - version = "1.0"; + version = "0.1"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-mit.git"; - rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be"; - sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-mit"; + rev = "v${version}"; + sha256 = "sha256-YM4/Sj8otuWJCrUBsglVnihxRGI32F6tSbODFM0a8TA="; }; buildInputs = [ chez chez-srfi ]; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index 39c1f73003e9b..59aedd29f0ec5 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }: +{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chez-scmutils"; - version = "1.0"; + version = "0.1"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-scmutils.git"; - rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2"; - sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-scmutils"; + rev = "v${version}"; + sha256 = "sha256-9GBoHbLNEnPz81s2rBYO3S0bXldetwc8eu9i5CgvYFE="; }; buildInputs = [ chez chez-srfi chez-mit ]; diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index 1d8579ae106e1..1780a1356c5c6 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez }: +{ stdenv, lib, fetchFromGitHub, chez }: stdenv.mkDerivation { pname = "chez-srfi"; version = "1.0"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-srfi.git"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-srfi"; rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507"; - sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj"; + sha256 = "sha256-8icdkbYmpTpossirFoulUhJY/8Jo+2eeaMwDftbZh+g="; }; buildInputs = [ chez ]; diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 1b87b508b6a12..ace8a3d2de398 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -1,14 +1,15 @@ -{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper +{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper , autoconf, automake, libtool, jdk, perl }: stdenv.mkDerivation { pname = "aldor"; version = "1.2.0"; - src = fetchgit { - url = "https://github.com/pippijn/aldor"; - sha256 = "19v07ffq4r1gjnmg7a8ifgjkwan9a3rwbj0qjz8fycwy221844m6"; + src = fetchFromGitHub { + owner = "aldorlang"; + repo = "aldor"; rev = "15471e75f3d65b93150f414ebcaf59a03054b68d"; + sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 4f3b200477f04..4b0e6e618e3ad 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -78,11 +78,11 @@ let pname = "nim-bootstrap"; version = "g${lib.substring 0 7 revision}"; - src = fetchgit { - # A Git checkout is much smaller than a GitHub tarball. - url = "https://github.com/nim-lang/csources_v1.git"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "csources_v1"; rev = revision; - sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043"; + sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A="; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 1ffc85a6ada58..f9ab0714b4708 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -1,14 +1,15 @@ # Build Open Dylan from source using the binary builds to bootstrap. -{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: +{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { pname = "opendylan"; version = "2016.1pre"; - src = fetchgit { - url = "https://github.com/dylan-lang/opendylan"; + src = fetchFromGitHub { + owner = "dylan-lang"; + repo = "opendylan"; rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; - sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; + sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; fetchSubmodules = true; }; diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 4e35ff35f6603..fbb1b4c1fd40d 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wxGTK, libX11, readline }: +{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }: let # BOSSA needs a "bin2c" program to embed images. @@ -13,14 +13,15 @@ let }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bossa"; version = "1.8"; - src = fetchgit { - url = "https://github.com/shumatech/BOSSA"; - rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; - sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; + src = fetchFromGitHub { + owner = "shumatech"; + repo = "BOSSA"; + rev = version; + sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y="; }; patches = [ ./bossa-no-applet-build.patch ]; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 56d37dd4e9472..9771a8f72d2a7 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: stdenv.mkDerivation { pname = "ceptre"; version = "unstable-2016-11-27"; - src = fetchgit { - url = "https://github.com/chrisamaphone/interactive-lp"; + src = fetchFromGitHub { + owner = "chrisamaphone"; + repo = "interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8"; + sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; + fetchSubmodules = true; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index ca55eceaedbfc..5b93357b26652 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, +{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -11,10 +11,11 @@ let no-jit = { flags = ""; target = "target.py"; }; no-jit-preload = { flags = ""; target = "target_preload.py"; }; }; - pixie-src = fetchgit { - url = "https://github.com/pixie-lang/pixie.git"; + pixie-src = fetchFromGitHub { + owner = "pixie-lang"; + repo = "pixie"; rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; - sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm"; + sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10="; }; pypy-tag = "91db1a9"; pypy-src = fetchurl { diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 19bc3524c5904..4b18cd7cfadc2 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,13 +1,14 @@ -{ fetchgit, lib, stdenv, ant, jdk }: +{ fetchFromGitHub, lib, stdenv, ant, jdk }: stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; - src = fetchgit { - url = "https://github.com/NixOS/hydra-ant-logger.git"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra-ant-logger"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; - sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176"; + sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; }; buildInputs = [ ant jdk ]; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 7a7cc165fe517..fe31e2ba348bd 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -14,10 +14,11 @@ let lispPackages = rec { description = "The Common Lisp package manager"; deps = []; - src = pkgs.fetchgit { - url = "https://github.com/quicklisp/quicklisp-client/"; - rev = "refs/tags/version-${version}"; - sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl"; + src = pkgs.fetchFromGitHub { + owner = "quicklisp"; + repo = "quicklisp-client"; + rev = "version-${version}"; + sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA="; }; overrides = x: rec { inherit clwrapper; diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 17bedd5e7d326..5c0b6b0eecb3b 100644 --- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -1,13 +1,14 @@ -{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck +{ mkDerivation, ansi-wl-pprint, base, fetchFromGitHub, lib, process, QuickCheck , transformers, transformers-compat }: mkDerivation { pname = "hercules-ci-optparse-applicative"; version = "0.16.1.0"; - src = fetchgit { - url = "https://github.com/hercules-ci/optparse-applicative.git"; - sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp"; + src = fetchFromGitHub { + owner = "hercules-ci"; + repo = "optparse-applicative"; rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e"; + sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc="; }; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 0aea58572cba0..2a9d6685b7ca6 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -1,15 +1,14 @@ -{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }: -let +{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }: + +buildPecl rec { pname = "memcached"; version = "3.1.5"; -in -buildPecl { - inherit pname version; - src = fetchgit { - url = "https://github.com/php-memcached-dev/php-memcached"; + src = fetchFromGitHub { + owner = "php-memcached-dev"; + repo = "php-memcached"; rev = "v${version}"; - sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; + sha256 = "sha256-AA3JakWxjk7HQl+8FEEGqLVNYHrjITZg3G25OaqAqwY="; }; internalDeps = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index fa00971ff2579..77c67e5a2aed4 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.5"; + version = "0.13.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dUNljMKsbl6eByhEYivWgRJczTBw3N1RVl8r3e898mg="; + hash = "sha256-aZ1Mquc4IfrdWjOaHMipjNb6gLGGbdKS8ah5b33eqGo="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 0b87aba816551..f2163621506fa 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.45.0"; + version = "7.45.1"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0="; + sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; }; preConfigure = '' diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index c077913b1eb14..e3d74600c9550 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -20,6 +20,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , webUISupport ? false +, extraGrammars ? {} }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -51,19 +52,18 @@ let runCommand "grammars" { } ('' mkdir $out '' + (lib.concatStrings (lib.mapAttrsToList - (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n") + (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (import ./grammars { inherit lib; })))); - builtGrammars = let change = name: grammar: callPackage ./grammar.nix { } { language = if grammar ? language then grammar.language else name; inherit version; - source = fetchGrammar grammar; + source = if grammar ? src then grammar.src else fetchGrammar grammar; location = if grammar ? location then grammar.location else null; }; - grammars' = (import ./grammars { inherit lib; }); + grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // @@ -71,7 +71,7 @@ let { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; in - lib.mapAttrs change grammars; + lib.mapAttrs change (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 3fccfc5f7b01c..4527f8d000e84 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,9 +1,9 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "39bf0977d223879436c1425fe6bfeb3bcfd86f92", - "date": "2021-08-15T13:16:31+09:00", - "path": "/nix/store/7kpf74gw4a68fby6jiw4n7lc4jfkgcf4-tree-sitter-clojure", - "sha256": "0ryj75znysvyvv4qaghygx1srrhlwhfmzmdilm652prkgj6yzh6b", + "rev": "1b24766fe9feacb8f5006233fe5c2ebd0ba31eff", + "date": "2022-02-19T08:24:15+09:00", + "path": "/nix/store/1vxhbw0dxg95z8rbs1b96nrcjvhrhb52-tree-sitter-clojure", + "sha256": "0sqi825gyjndn3v00kvk9scw6s5q0lr3ig6v49sccqc2addnr6di", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 47c6b811ff160..dfbdbd5d9317f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "656d7ea44b2b0daece78791e30281e283f30001e", - "date": "2022-01-17T09:06:11-06:00", - "path": "/nix/store/w4qqya24zf0cd7rqw1440szrrad8nf23-tree-sitter-cpp", - "sha256": "0vfgv9rw8pw4d41p5rndy7cjw8w0k0vnn54cwpxkm3r2vblnjn58", + "rev": "a832195eb3685a279856bb480ce19cff19554b6d", + "date": "2022-03-14T15:34:21-05:00", + "path": "/nix/store/ixca3nass3hkf0pycf7zhz15h2yq11sk-tree-sitter-cpp", + "sha256": "1y0i3w21zg8khns97wy5wpw57bhni4c8faszaz9qb0nrgarbf3i6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index d9fb78dd2723c..282b95895ed7a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "14cd86e18ba45e327017de5b3e0f8d8f7f8e98ec", - "date": "2022-01-24T00:39:28+01:00", - "path": "/nix/store/3lskjrhqd16ymvsbrwzcsdd80cyr7ljj-tree-sitter-cuda", - "sha256": "09qpl5mfv39788smz87zbzp04i3rdhsckjjqngvr0w24dsw30nyx", + "rev": "5178a7a5b25dc7ee4a69bf72f31bd6d3ff0a0795", + "date": "2022-03-16T21:48:20+01:00", + "path": "/nix/store/gd5s063qfyas370a9rd8mn9wc9d68s15-tree-sitter-cuda", + "sha256": "17zqpd27b09izpp9lvkgc1hcnq5nc58i98pak0qi46z85r6zgp6g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json index 951daa9e3d9fe..072f0eab727b2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json @@ -1,9 +1,9 @@ { "url": "https://github.com/camdencheek/tree-sitter-dockerfile", - "rev": "7af32bc04a66ab196f5b9f92ac471f29372ae2ce", - "date": "2021-12-16T07:47:57-07:00", - "path": "/nix/store/gh1pnracilf89q9z5czqr4z7lkd480xb-tree-sitter-dockerfile", - "sha256": "06hy683mrp1jcg2ypd6msbmv0pm2z85y8nqxgrnbr9vbi6syvmp5", + "rev": "d34a0cebd094e830bdd2106a28cb2f1fb22401d8", + "date": "2022-01-27T11:20:14-07:00", + "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile", + "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index 63660cccfb3b1..bc84c3b1f37c0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -1,9 +1,9 @@ { "url": "https://github.com/rydesun/tree-sitter-dot", - "rev": "92877bac7033e409ccfb3f07fe28ef1dfd359457", - "date": "2021-10-13T19:28:51+08:00", - "path": "/nix/store/h3dyw3kcgw77lma750wjgr1n8pjllxn6-tree-sitter-dot", - "sha256": "1l8g348nqqil7lygkhzw1ydwf3q2m5786qddp1f9jg1bdrv9p8rl", + "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7", + "date": "2022-03-11T21:17:49+08:00", + "path": "/nix/store/3xvainpyzwpbhbm30mmvvgxpgh4agljh-tree-sitter-dot", + "sha256": "1q2rbv16dihlmrbxlpn0x03na7xp8rdhf58vwm3lryn3nfcjckn2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index b0bad04a86fbd..c6257a25b157b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "de20391afe5cb03ef1e8a8e43167e7b58cc52869", - "date": "2022-01-10T10:35:12-06:00", - "path": "/nix/store/099pwd7iv86g1j4fplgq33a4jpwbvv60-tree-sitter-elixir", - "sha256": "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h", + "rev": "b4027d7cfc96935b50878bdf9faf80bd64ac73cf", + "date": "2022-03-04T15:40:04+00:00", + "path": "/nix/store/h3qh2s4q51bnq66p1v067g1fb8bd1743-tree-sitter-elixir", + "sha256": "1pf2n1j8j5w7mrh81yzvha1gh4w3vffngikj04kzd5gkx9asf3x6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json index b824f34f27a09..c948d53289b48 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json @@ -1,9 +1,9 @@ { "url": "https://github.com/abstractmachineslab/tree-sitter-erlang", - "rev": "9d5fd0c329280a156bf7614a49dc5e8c58cc037c", - "date": "2021-08-03T11:57:52+02:00", - "path": "/nix/store/35ydhh12dgf4q016gjka35wnqnkwc1jg-tree-sitter-erlang", - "sha256": "0d6wl95wgys21vcix6j0bf7l000glkmk1n6shgcnp4baw9wxh009", + "rev": "fab680273af1a8f5cc0c3a0c62cbf5b1bea71f39", + "date": "2022-03-05T23:18:36+01:00", + "path": "/nix/store/vj28kyy3jg21qicwxq2g1ysrwfqd3mz9-tree-sitter-erlang", + "sha256": "0shzzik8yxwb76kxs3l0fccjwvkarck1q4wqyv5hdma6hwl52b69", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 8684e176cb69e..5bea07ef1e3cf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "fce4331731a960077ff5f98939bc675179f1908a", - "date": "2021-09-30T09:09:52-04:00", - "path": "/nix/store/mhpkw4gl6lzi306q21kckafqcdc0a715-tree-sitter-fennel", - "sha256": "1k8acyav26248liz0psk2r9dl7472mqgdyrjwg3pfxx94jgqjcik", + "rev": "d37fd84a702b78ff0282f223ece83c61ab062a6e", + "date": "2022-02-21T08:13:28-05:00", + "path": "/nix/store/lafx5rw9r9jp9056sv0sk89kxfjlb9x3-tree-sitter-fennel", + "sha256": "1wqvz8v877jh7shv50xbnx1bxvdlnfnpmndwzsb0smidnzx7lbw2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index b32445c2804c1..a060a455955c0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f", - "date": "2021-08-02T21:46:56+01:00", - "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", - "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", + "rev": "d482d70ea8e191c05b2c1b613ed6fdff30a14da0", + "date": "2022-03-14T15:15:13+00:00", + "path": "/nix/store/5ajcf2hl1hph7iky6lwp5vh7a49k587s-tree-sitter-fish", + "sha256": "0idnm9lrvj1jhrvrgcddppkc09hr7inciz6k02d0nnxv8pqaw3w6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 31114781f58c3..e1d4462e225d9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "d6ccd2d9c40bdec29fee0027ef04fe5ff1ae4ceb", - "date": "2022-01-07T03:13:04+01:00", - "path": "/nix/store/biyjfajma7nr175xviaw65jksqfak893-tree-sitter-haskell", - "sha256": "0zfxi3adqhy7d1w2dvnywkms8a4vfxkjswdhar7p5sxyps8a5wry", + "rev": "ed976b81b00ce7b72b99bca75e7a616cc526220c", + "date": "2022-03-20T00:05:14+01:00", + "path": "/nix/store/wzkfkix4q3vcrlsj2v4q32ihw0vdp1li-tree-sitter-haskell", + "sha256": "19g5f59gh6s4xpphrppmrqlh0nfld0q8zffy85pkby4gd6xh73zm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 6f9344437bfad..664e31613c5d3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "a24ae7d16de3517bff243a87d087d0b4877a65c5", - "date": "2022-01-12T08:57:59-08:00", - "path": "/nix/store/dipis7syj55xrmc72gvx2f9q672mn6dg-tree-sitter-java", - "sha256": "0p01xkxzdjwx32hd6k4kqidlhkgj8q9b9lp4g4fra5gx9w159iqm", + "rev": "881b84fe7078651af5077cc4cea4c85f9fddde3b", + "date": "2022-03-21T10:50:51+01:00", + "path": "/nix/store/ii1dwsg972sbllim6vrmjbcaw9fcy2b1-tree-sitter-java", + "sha256": "0kvqqrx669fyaxm55l0p5vbswf9bfknl0brsr6llyzdz81dl0vk4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index 5cf20f27968fe..739e6006c2757 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "323b609de40b7729073482a3c59de76cfba7744f", - "date": "2022-02-08T21:23:53+01:00", - "path": "/nix/store/f6kvr0x41rbb64s36ii6bj30fqaallz4-tree-sitter-latex", - "sha256": "1qsw5wcqs65ip0qq17vq6bf2snnpvw61iq2ahgwl9842ir15hrbr", + "rev": "b71e4928a63a6d75bc1670004a5b5a98c850a149", + "date": "2022-03-16T20:19:11+01:00", + "path": "/nix/store/gzpihd6k8cqsl0facz7kfgn2dh294fxw-tree-sitter-latex", + "sha256": "1z2ywj57fpxaym6bv5ixvc01h8szazbhzmzzw960f49mlrima3n6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index e34455069bc33..5da2dc0585e76 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "8bee14c30ecadd55c2d65633973b4e81f93525e0", - "date": "2022-01-16T14:47:09+01:00", - "path": "/nix/store/cv7xqvcj4bjifzddkx5n2jd723dc6vlf-tree-sitter-markdown", - "sha256": "0vibmpp86pkqllfhb0kg6zhaz09sh8m6a2d1xa8p2qdi7ryy7wqa", + "rev": "b49b2da50864171eff56acc8ba067c3540a3991f", + "date": "2022-02-26T15:22:17+01:00", + "path": "/nix/store/vllxsz0nvlw6z9y6s199l5z8f5dlhcpv-tree-sitter-markdown", + "sha256": "1adypmkfsf6pgahba588d8l6ib59209rb2fkyk2dv0d3va76pr8x", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json index 801634201c867..4a4eecf5ddb32 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d", - "date": "2021-11-29T00:27:21-06:00", - "path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix", - "sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9", + "rev": "470b15a60520ff7b86f51732b8d8f1118c86041e", + "date": "2022-03-18T01:42:08-05:00", + "path": "/nix/store/c5y76kz7wmfq05hfw4xpqz2ahcdy924f-tree-sitter-nix", + "sha256": "1hl0mpy0i6r160v6v3nflrdi5fnmd8i5zbx963h5nj9fg4srkb5r", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 1743d2252cd63..a4846c64e694c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "b7f879eaf9f20852f6b670439154b0128fbb6558", - "date": "2022-02-08T12:24:02+01:00", - "path": "/nix/store/q02py98zm9cmalzc5a0yqw8lg73ybx9g-tree-sitter-norg", - "sha256": "07hm5sysb25ivlz52ijnbka02hlqksha259w7v03awap85i9ydk6", + "rev": "17d61df817c1e0a9cdef8d915d4e4c556b7cf68c", + "date": "2022-03-16T16:23:43+01:00", + "path": "/nix/store/xjsyabq06584fnwjvqbyqf6yd19i4gn9-tree-sitter-norg", + "sha256": "161pmkpfyfhf4lcgkzcl1wdi4bsmmpwxcz7kjcb0jpjy7bamikch", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 9585b6c607687..8b4175a4f3cc2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "ab2b39439f2fc82fd5ea0b7e08509760d4cbacd5", - "date": "2022-01-23T13:55:11-05:00", - "path": "/nix/store/s55aybm3r5n7l7nx916mhjyry96xcvin-tree-sitter-perl", - "sha256": "16ap0yq9gmh0kbyka7zcpjw3dl368n23sxp3v82z4ccwzmgfmaw4", + "rev": "bbf86084d9b7eb4768f3fb9fe094b3e0600057b1", + "date": "2022-02-26T01:42:56+05:30", + "path": "/nix/store/cpsi8sjl3d1v5sg2rcsw3arf7zwm4l06-tree-sitter-perl", + "sha256": "037kdl6kq47p35qd3p6j4560x6w24zzmjxnz2fkd28xrm0lsh9lm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index ec69a798aad65..ad0fbd525ed85 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -1,9 +1,9 @@ { "url": "https://github.com/victorhqc/tree-sitter-prisma", - "rev": "74a721e8eed1a4a25cf495d45974ba24f315f81a", - "date": "2021-11-19T19:52:32+01:00", - "path": "/nix/store/rbr2p57ic1kn0121ca6k0bh2r8svw066-tree-sitter-prisma", - "sha256": "1b8yil6v9jz9ndx2kzln639fkjkj1xb0qfcip1njxcq5mlqlfswd", + "rev": "bf0833cbedb2c5b39250f5ba900f1239a16c6749", + "date": "2022-03-18T18:56:29+01:00", + "path": "/nix/store/9pq2l5b34xvi3v6i9zq1qxh3r2ilg2qs-tree-sitter-prisma", + "sha256": "0idgrra41w4v3sa4sb0p3ba7k6sxfw74px4fkpprddjqjdnsrl50", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 87cc40f83b892..670103d5c78d2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68", - "date": "2022-02-04T13:11:35-08:00", - "path": "/nix/store/i1f2zyrqghy98pl7dfnvcpbs3jsnmhay-tree-sitter-rust", - "sha256": "174j5pxwf80c4xniri39l3a6bb7nq96g2s8hh5sgv4i7xvbpfsmg", + "rev": "0509e440ae042db6483984b3a56b3c5f24b5d9b9", + "date": "2022-03-09T12:11:47+01:00", + "path": "/nix/store/9jrsqsrql5wlbzmqna111w4a02hf75z2-tree-sitter-rust", + "sha256": "1r8n8441b8bppizlzh4xw7yy3amz4apfxpqxm8hw0n3j3iwnw4pz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 12322fe82b402..f4aaecb7bdf3a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "bc573ef552adf8bed9e36eb687a0cccf43158634", - "date": "2022-01-24T16:13:56+01:00", - "path": "/nix/store/2i9n2fvjk0ymxv32ziq5z9ykv95svi7d-tree-sitter-viml", - "sha256": "0ckx9jh9fqfw5x9yb0sljczb0xsgxs8j6v2qbqywh5z6fcqx8sjc", + "rev": "c9d70082af14988842eb071c6c0b07e8d1d993ac", + "date": "2022-03-21T17:11:25+01:00", + "path": "/nix/store/z1bjg25frb0sq7kr0s3sp6jnz888p900-tree-sitter-viml", + "sha256": "05mf8i5ni0kp4g1gdpgwjxi2d86hna2ijp9k7c1gy9j33hsq9i8g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 5ab34fb0e25b5..a9de3692209e1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "93331b8bd8b4ebee2b575490b2758f16ad4e9f30", - "date": "2022-01-10T15:22:15+09:00", - "path": "/nix/store/g54w7vid7nf9shzfipch646dk4d88ah7-tree-sitter-zig", - "sha256": "0irckd6bh3i1vr5bi2lwsbvibbpih3jv3xqdq0dbsiy447dfiv50", + "rev": "42e93d02ca945094699e2dc4de785bbaf8f740ec", + "date": "2022-02-11T10:40:42+09:00", + "path": "/nix/store/2yv27si133zqb93bm9gia0ymib9q2y75-tree-sitter-zig", + "sha256": "14p02b04v67cvkvj7apipsmkmvv3jnhykm0qrrmqqxnkprac31im", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9ee452b26f9c2..0d828eb8b9ed5 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -41,7 +41,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ - --add-flags "-f $dir/wp-cli" + --add-flags "-f $dir/wp-cli" \ + --add-flags "--" # this is a very basic run test $out/bin/wp --info >/dev/null diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 3e90857d8db88..5aff026aa9ced 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, enableJemalloc ? !stdenv.hostPlatform.isMusl, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -13,7 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ jemalloc zlib ]; + buildInputs = [ zlib ] ++ lib.optional enableJemalloc jemalloc; + + # Note: tcmalloc and mimalloc are also supported (and normal malloc) + cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc"; + + hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "pie"; meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index e05d77d8a137c..9823ee5dddd38 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-02-24T22-12-01Z"; + version = "2022-03-17T06-34-49Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-7bnT+rxQw2h1wCkXjsYm8ystU9F4EUL0KASkJmqLgXQ="; + sha256 = "sha256-iHwFkxfSLrtzSiOmfVFggBvfL0SL6ZLVJWMGK3RHZGU="; }; - vendorSha256 = "sha256-fYpnYMt6VrC2eem8XvK8oAR1B0rQ4DV6ZWo0cLNCjCs="; + vendorSha256 = "sha256-ujkrbP7FuL7jdYTRaGMEYha1BJKJnpCssuO47XGMBGo="; doCheck = false; diff --git a/pkgs/tools/misc/bitbucket-cli/default.nix b/pkgs/tools/misc/bitbucket-cli/default.nix deleted file mode 100644 index 4a770b187fe74..0000000000000 --- a/pkgs/tools/misc/bitbucket-cli/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, python2 -}: - -python2.pkgs.buildPythonApplication rec { - pname = "bitbucket-cli"; - version = "0.5.1"; - - src = python2.pkgs.fetchPypi { - inherit pname version; - sha256 = "1xmn73x6jirnwfwcdy380ncmkai9f9dhmld6zin01ypbqwgf50fq"; - }; - - propagatedBuildInputs = with python2.pkgs; [ - requests - ]; - - # No tests - doCheck = false; - - meta = with lib; { - description = "Bitbucket command line interface"; - homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; - maintainers = with maintainers; [ refnil ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3821f18ecdc8f..e279e2edc0d9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -100,6 +100,7 @@ mapAliases ({ beegfs = throw "beegfs has been removed"; # Added 2019-11-24 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e25966acfce8..9e27960043a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,8 +2301,6 @@ with pkgs; birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; - bitbucket-cli = callPackage ../tools/misc/bitbucket-cli { }; - bitbucket-server-cli = callPackage ../applications/version-management/git-and-tools/bitbucket-server-cli { }; blitz = callPackage ../development/libraries/blitz { }; @@ -15934,7 +15932,7 @@ with pkgs; travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = callPackage ../development/tools/parsing/tree-sitter { + tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { inherit (darwin.apple_sdk.frameworks) Security; }; |