From 30e5965f6bb904cb0e28ac6f02c36c6101ada49a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 20 May 2021 22:21:10 -0700 Subject: [PATCH 01/21] python3Packages.purl: 1.5 -> 1.6 --- pkgs/development/python-modules/purl/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 43fd5b71ca6c..aa85ea3965ab 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -1,22 +1,19 @@ { lib, buildPythonPackage, fetchFromGitHub -, nose -, six +, pytestCheckHook }: buildPythonPackage rec { pname = "purl"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "codeinthehole"; repo = "purl"; rev = version; - sha256 = "0vi7xdm2xc1rbqrz5jwpr7x7dnkcrbjf1mb4w1q2c2f8jca0kk0g"; + sha256 = "sha256-Jb3JRW/PtQ7NlO4eQ9DmTPu/sjvFTg2mztphoIF79gc="; }; - propagatedBuildInputs = [ six ]; - - checkInputs = [ nose ]; + checkInputs = [ pytestCheckHook]; meta = with lib; { description = "Immutable URL class for easy URL-building and manipulation"; From ffa6f1573c1080e390bb6252f955b6cebbd20619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 May 2021 10:44:17 +0200 Subject: [PATCH 02/21] python3Packages.drf-jwt: 1.19.0 -> 1.19.1 https://github.com/Styria-Digital/django-rest-framework-jwt/blob/1.19.1/CHANGELOG.md --- pkgs/development/python-modules/drf-jwt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix index ad3edc59246d..2cf125c8df35 100644 --- a/pkgs/development/python-modules/drf-jwt/default.nix +++ b/pkgs/development/python-modules/drf-jwt/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , pyjwt , djangorestframework -, pytestCheckHook }: buildPythonPackage rec { pname = "drf-jwt"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "Styria-Digital"; repo = "django-rest-framework-jwt"; rev = version; - sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7"; + sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g="; }; propagatedBuildInputs = [ From 8bf4f7e2f3ac9232e7e198296f4904c634848216 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 24 May 2021 19:09:06 +0200 Subject: [PATCH 03/21] rPackages.lwgeom: fix build --- pkgs/development/r-modules/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 067db74663e2..f16a6d0bb4aa 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -276,6 +276,7 @@ let jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl_1 ]; kza = [ pkgs.fftw.dev ]; + lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl_1 ]; @@ -406,6 +407,7 @@ let gdtools = [ pkgs.pkg-config ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; + lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ]; magick = [ pkgs.pkg-config ]; mwaved = [ pkgs.pkg-config ]; odbc = [ pkgs.pkg-config ]; From e649cfc1e955936ca8e4d9af3e9dadb088d9f404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 26 May 2021 07:45:49 +0200 Subject: [PATCH 04/21] schismtracker: fix darwin build --- pkgs/applications/audio/schismtracker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 3b5708529e06..797d2c1d7337 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; - configureFlags = [ "--enable-dependency-tracking" ]; + configureFlags = [ "--enable-dependency-tracking" ] + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ autoreconfHook python ]; From 044ba9b560ac3ddf74e2909b1a2810e1b66de6fa Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 27 May 2021 17:03:16 +1000 Subject: [PATCH 05/21] singularity: 3.7.3 -> 3.7.4 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index fe66df0c6d98..2610e1f0fc6a 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-ZmfriHXStm1zUE9AyVa0KxNRdE9IjRZCBDdiFdiF2lw="; + sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ="; }; goPackagePath = "github.com/sylabs/singularity"; From 32e85273a446c76f2da79ca99fc4ab7cef443d24 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 28 May 2021 01:02:01 +0000 Subject: [PATCH 06/21] argo: 3.0.6 -> 3.0.7 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index fa9416f927f8..78d6ea1a1e7e 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-QD5V6Bz/wfbyNPoXizjhPGyHN7ieotsYbwLTz2ADfcY="; + sha256 = "sha256-lZTSUNtmJZKONt0Bv42dBAc+87L14HaPxvPxhFe8nyc="; }; vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; From 760592a19186ae5910507649aa513d2f511237a6 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Tue, 25 May 2021 15:12:25 +0530 Subject: [PATCH 07/21] xplr: 0.10.1 -> 0.13.1 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 56553a80e912..6bd2c60b09b0 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.10.1"; + version = "0.13.1"; src = fetchCrate { inherit pname version; - sha256 = "17x514pwbkzkkrd47a66a4iz3bxrxvm8hk5hphsfbhgzqfnf9iy7"; + sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "03y2fk174rdjvw8wdzwc0hhj0zqwpap7qcga51yhq877rgyxbxir"; + cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From cff04883e8c21fe614dad85a96b3da93909eb8c8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 29 May 2021 03:30:51 -0400 Subject: [PATCH 08/21] arrow-cpp: 4.0.0 -> 4.0.1 --- pkgs/development/libraries/arrow-cpp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ac53ae3bbd44..a13ebf281934 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -22,12 +22,12 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa"; + sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -146,11 +146,11 @@ in stdenv.mkDerivation rec { --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' ''; - meta = { + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ tobim veprbl ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ tobim veprbl ]; }; } From 678920b13bed59e76efbc4d8fac34451c86b6c7b Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 19 May 2021 02:00:36 +0900 Subject: [PATCH 09/21] release.nix: add aarch64-darwin as a supportedSystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cbaf2ee7a0420727ab79ce1adfcccab35e87b479) Signed-off-by: Domen Kožar --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0b18dd1ecf26..34f74117729c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -11,7 +11,7 @@ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } , officialRelease ? false # The platforms for which we build Nixpkgs. -, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] , limitedSupportedSystems ? [ "i686-linux" ] # Strip most of attributes when evaluating to spare memory usage , scrubJobs ? true From fbe60d186b79349632d1fd0e225f502c96628e0a Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Sun, 30 May 2021 18:05:51 -0400 Subject: [PATCH 10/21] neovim: always generate rplugin.vim (#124990) --- pkgs/applications/editors/neovim/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4defc2d43278..7fa15efd82cc 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -107,6 +107,7 @@ let '') + '' rm $out/bin/nvim + touch $out/rplugin.vim makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; From b72b3c557170013601ceffd8c94a40764d34d302 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 30 May 2021 18:26:05 -0400 Subject: [PATCH 11/21] xfitter: remove `hardeningDisable = [ "format" ];` Not needed after f42aa7e1 ('cc-wrapper: set FC when langFortran is on') --- pkgs/applications/science/physics/xfitter/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 4390826ccee0..230f2f0e0efb 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { ./undefined_behavior.patch ]; - # patch needs to updated due to version bump - #CXXFLAGS = "-Werror=return-type"; - preConfigure = # Fix F77LD to workaround for a following build error: # @@ -48,8 +45,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; From 2c988b6132f8b5bdaf490efd26f8d027366c7548 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 31 May 2021 01:15:05 +0200 Subject: [PATCH 12/21] plex: 1.23.0.4482-62106842a -> 1.23.1.4602-280ab6053 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6f29d336da12..32612d2e4521 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.0.4482-62106842a"; + version = "1.23.1.4602-280ab6053"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v"; + sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq"; + sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli"; }; outputs = [ "out" "basedb" ]; From 79c75e54e57590fabc14ba0b132cea864c140580 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 30 May 2021 22:15:00 +0900 Subject: [PATCH 13/21] vscode-extensions.B4dM4n.vscode-nixpkgs-fmt: init --- pkgs/misc/vscode-extensions/default.nix | 55 +++++++++++++++---------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6f61a94ca149..549b2785382a 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -87,6 +87,18 @@ let }; }; + B4dM4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixpkgs-fmt"; + publisher = "B4dM4n"; + version = "0.0.1"; + sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + baccata.scaladex-search = buildVscodeMarketplaceExtension { mktplcRef = { name = "scaladex-search"; @@ -516,7 +528,7 @@ let }; }; - hashicorp.terraform = callPackage ./terraform {}; + hashicorp.terraform = callPackage ./terraform { }; hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -698,15 +710,16 @@ let }; }; - ms-vscode.cpptools = callPackage ./cpptools {}; + ms-vscode.cpptools = callPackage ./cpptools { }; - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; - ms-python.python = let - raw-package = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; - in + ms-python.python = + let + raw-package = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + in buildEnv { name = "vscode-extension-ms-python-python-full"; paths = [ raw-package self.ms-toolsai.jupyter ]; @@ -786,7 +799,7 @@ let }; }; - matklad.rust-analyzer = callPackage ./rust-analyzer {}; + matklad.rust-analyzer = callPackage ./rust-analyzer { }; ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = with lib; { @@ -1029,7 +1042,7 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare {}; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1094,7 +1107,7 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; - WakaTime.vscode-wakatime = callPackage ./wakatime {}; + WakaTime.vscode-wakatime = callPackage ./wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1109,17 +1122,17 @@ let }; }; - aliases = self: super: { - # aliases - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; - }; + aliases = self: super: { + # aliases + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + }; - # TODO: add overrides overlay, so that we can have a generated.nix - # then apply extension specific modifcations to packages. + # TODO: add overrides overlay, so that we can have a generated.nix + # then apply extension specific modifcations to packages. - # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals (config.allowAliases or true) [ aliases ]; + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals (config.allowAliases or true) [ aliases ]; - toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in - lib.fix toFix +lib.fix toFix From c383345cc8fa978a71dc07d23acc4cd9eafcc934 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 27 May 2021 23:09:01 +0900 Subject: [PATCH 14/21] erlang: main R23 -> R24 --- pkgs/top-level/beam-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index e4ce5b6d3c84..334aac359b37 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -6,11 +6,11 @@ rec { # Each interpreters = rec { - # R23 is the default version. - erlang = erlangR23; # The main switch to change default Erlang version. - erlang_odbc = erlangR23_odbc; - erlang_javac = erlangR23_javac; - erlang_odbc_javac = erlangR23_odbc_javac; + # R24 is the default version. + erlang = erlangR24; # The main switch to change default Erlang version. + erlang_odbc = erlangR24_odbc; + erlang_javac = erlangR24_javac; + erlang_odbc_javac = erlangR24_odbc_javac; # Standard Erlang versions, using the generic builder. From 1c979e4116d132dba334091878ad0bb5cfa966a0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:26:32 +0900 Subject: [PATCH 15/21] elixir 1_8: set erlang to R23 --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 203668c3cb87..234f1d3a9990 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -63,7 +63,7 @@ let }; elixir_1_8 = lib'.callElixir ../interpreters/elixir/1.8.nix { - inherit erlang; + erlang = pkgs.beam.interpreters.erlangR23; debugInfo = true; }; From f5e242b7b625bab1e903c2e7c3021e02aea288ac Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:26:44 +0900 Subject: [PATCH 16/21] cl: set erlang to R23 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85af183b8bcd..6234cbceb9e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14438,7 +14438,9 @@ in chromaprint = callPackage ../development/libraries/chromaprint { }; - cl = callPackage ../development/libraries/cl { }; + cl = callPackage ../development/libraries/cl { + erlang = erlangR23; + }; clanlib = callPackage ../development/libraries/clanlib { }; From 8aee68a9f7e87a057c66e00bd445c64f64fe527e Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 13:39:18 +0900 Subject: [PATCH 17/21] rabbitmq-server: set erlang version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6234cbceb9e5..54998083704b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19692,7 +19692,7 @@ in rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; elixir = beam_nox.interpreters.elixir_1_8; - erlang = erlang_nox; + erlang = beam_nox.interpreters.erlangR23; }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; From 0e705d7a255efbc6d5e345985da46f34a4f4afae Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 28 May 2021 21:19:26 +0900 Subject: [PATCH 18/21] relxExe: 3.32.1 -> 4.3.0 --- pkgs/development/tools/erlang/relx-exe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix index 0f9d973e6773..890b90e4888f 100644 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ b/pkgs/development/tools/erlang/relx-exe/default.nix @@ -2,18 +2,18 @@ rebar3Relx rec { name = "relx-exe"; - version = "3.32.1"; + version = "4.3.0"; releaseType = "escript"; src = fetchHex { pkg = "relx"; - sha256 = "0693k8ac7hvpm9jd3ysbdn8bk97d68ini22p1fsqdsi9qv9f7nq7"; + sha256 = "sha256-c44JSab8fQ3p5FSdwPc9m24FtTnhURuySFkHArMiBEA="; inherit version; }; checkouts = fetchRebar3Deps { inherit name version; src = "${src}/rebar.lock"; - sha256 = "0l7r3x7zwcz49013zv8z5v2i06p7wqkgzdyzrl8jk0hglscvhpf6"; + sha256 = "sha256-BY/c4+vqdnn4FBPzLExEZIZ27f1g46XISb8mIpMU8aI="; }; } From 2402d70ef36cb7b09575c7e21bd8ee70ec76d259 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 29 May 2021 08:43:32 +0900 Subject: [PATCH 19/21] relxExe: remove relxExe is not intended to be used as a single standalone executable, but as a library by rebar3 --- pkgs/development/beam-modules/default.nix | 1 - .../tools/erlang/relx-exe/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/tools/erlang/relx-exe/default.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 234f1d3a9990..0c184e0ba730 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -83,7 +83,6 @@ let # without helper functions buildRebar3 and buildMix. hex = callPackage ./hex { }; webdriver = callPackage ./webdriver { }; - relxExe = callPackage ../tools/erlang/relx-exe { }; }; in makeExtensible packages diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix deleted file mode 100644 index 890b90e4888f..000000000000 --- a/pkgs/development/tools/erlang/relx-exe/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchHex, fetchRebar3Deps, rebar3Relx }: - -rebar3Relx rec { - name = "relx-exe"; - version = "4.3.0"; - releaseType = "escript"; - - src = fetchHex { - pkg = "relx"; - sha256 = "sha256-c44JSab8fQ3p5FSdwPc9m24FtTnhURuySFkHArMiBEA="; - inherit version; - }; - - checkouts = fetchRebar3Deps { - inherit name version; - src = "${src}/rebar.lock"; - sha256 = "sha256-BY/c4+vqdnn4FBPzLExEZIZ27f1g46XISb8mIpMU8aI="; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54998083704b..5f060afa922b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12099,8 +12099,7 @@ in inherit (beam.packages.erlang) erlang-ls rebar rebar3 rebar3WithPlugins - fetchHex beamPackages - relxExe; + fetchHex beamPackages; inherit (beam.packages.erlangR21) lfe lfe_1_3; From 85d6f6f1f328ad78d963609e4fd5d091291c4bb0 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 31 May 2021 02:56:33 +0200 Subject: [PATCH 20/21] teamspeak_server: 3.13.3 -> 3.13.5 (#124601) --- .../instant-messengers/teamspeak/server.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e266265291b3..daa97b682176 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -4,13 +4,13 @@ let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.13.3"; + version = "3.13.5"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw=" - else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c="; + then "sha256-2tSX/ET2lZsi0mVB3KnbnBXMSTRsneGUA8w6mZ6TmlY=" + else "sha256-RdxG4nGXTTSY+P5oZu4uP5l7gKcU9C6uIILyNldSK50="; }; buildInputs = [ stdenv.cc.cc postgresql.lib ]; @@ -18,6 +18,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' + runHook preInstall + # Install files. mkdir -p $out/lib/teamspeak mv * $out/lib/teamspeak/ @@ -26,18 +28,20 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin/ ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver + + runHook postInstall ''; passthru.updateScript = writeScript "update-teampeak-server" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused jq pup set -eu -o pipefail version=$( \ - curl -s "https://www.teamspeak.de/download/teamspeak-3-amd64-server-linux/" \ - | grep softwareVersion \ - | sed -E -e 's/^.*([^<]+)<\/span>.*$/\1/' \ + curl https://www.teamspeak.com/en/downloads/ \ + | pup "#server .linux .version json{}" \ + | jq -r ".[0].text" ) versionOld=$(nix-instantiate --eval --strict -A "teamspeak_server.version") From 34c6163ed91a8ab4c0d1160590ccb510fb285a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Ch=C3=A9rel?= <6168820+guillaumecherel@users.noreply.github.com> Date: Mon, 31 May 2021 02:58:14 +0200 Subject: [PATCH 21/21] mblaze: fix mcom to use file utility. (#94881) Co-authored-by: Sandro --- .../networking/mailreaders/mblaze/default.nix | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 278561e0e5f4..f24ed3a51df6 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,10 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }: +{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused +, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby +}: stdenv.mkDerivation rec { pname = "mblaze"; version = "1.1"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { @@ -22,6 +24,24 @@ stdenv.mkDerivation rec { installShellCompletion contrib/_mblaze '' + lib.optionalString (ruby != null) '' install -Dt $out/bin contrib/msuck contrib/mblow + + # The following wrappings are used to preserve the executable + # names (the value of $0 in a script). The script mcom is + # designed to be run directly or via symlinks such as mrep. Using + # symlinks changes the value of $0 in the script, and makes it + # behave differently. When using the wrapProgram tool, the resulting + # wrapper breaks this behaviour. The following wrappers preserve it. + + mkdir -p $out/wrapped + for x in mcom mbnc mfwd mrep; do + mv $out/bin/$x $out/wrapped + makeWrapper $out/wrapped/$x $out/bin/$x \ + --argv0 $out/bin/$x \ + --prefix PATH : $out/bin \ + --prefix PATH : ${lib.makeBinPath [ + coreutils file gawk gnugrep gnused + ]} + done ''; meta = with lib; {