diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 79bba37a1358..c6eaf4624291 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -100,6 +100,17 @@ compatible. + + + ngrok has been upgraded from 2.3.40 to + 3.0.4. Please see + the + upgrade guide and + changelog. + Notably, breaking changes are that the config file format has + changed and support for single hypen arguments was dropped. + + The isPowerPC predicate, found on diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 50bf15ca197d..56df3c00cb20 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -45,6 +45,10 @@ In addition to numerous new and upgraded packages, this release has the followin `lib.systems.parse.isCompatible` still exists, but has changed semantically: Architectures with differing endianness modes are *no longer considered compatible*. +- `ngrok` has been upgraded from 2.3.40 to 3.0.4. Please see [the upgrade guide](https://ngrok.com/docs/guides/upgrade-v2-v3) + and [changelog](https://ngrok.com/docs/ngrok-agent/changelog). Notably, breaking changes are that the config file format has + changed and support for single hypen arguments was dropped. + - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. - PHP 7.4 is no longer supported due to upstream not supporting this diff --git a/pkgs/tools/networking/ngrok-2/versions.json b/pkgs/tools/networking/ngrok-2/versions.json deleted file mode 100644 index 85b0e47168a2..000000000000 --- a/pkgs/tools/networking/ngrok-2/versions.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "linux-386": { - "sys": "linux-386", - "url": "https://bin.equinox.io/a/c4ZY6f7svn7/ngrok-2.3.40-linux-386", - "sha256": "1b645ff0abbb28ca7c0f6a2109653be2dc281860b582b4de6927fde12c99da26", - "version": "2.3.40" - }, - "linux-amd64": { - "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/b5PAmc6L9z2/ngrok-2.3.40-linux-amd64", - "sha256": "218d267cd1195334718bafac14bfdf1c19dc95dcf8a24aaa6a1383c21dc86e76", - "version": "2.3.40" - }, - "linux-arm": { - "sys": "linux-arm", - "url": "https://bin.equinox.io/a/aRh9rdUAJyf/ngrok-2.3.40-linux-arm", - "sha256": "538a7431df141a929a250eaf6ed7afdcce817bcd8cfe60b61f4c6d7a289b1d1c", - "version": "2.3.40" - }, - "linux-arm64": { - "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/2gpRjDRBpJv/ngrok-2.3.40-linux-arm64", - "sha256": "dc7b4465ef95f6d04d1b1996111b3a2631e5f464d7dca7f4994f59ea4edbe21f", - "version": "2.3.40" - }, - "darwin-amd64": { - "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/fcZQXtHSDgM/ngrok-2.3.40-darwin-amd64", - "sha256": "80c8fb121d6c93350d84351d9516674f4e20a3e003cdd7dcb4c3e7c48b9c5b07", - "version": "2.3.40" - }, - "darwin-arm64": { - "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/3TEKdZeyAnt/ngrok-2.3.40-darwin-arm64", - "sha256": "c9e6dfec454f9faec92a13dfd3f3857de982007e3b85987bb875aa0d74ca8101", - "version": "2.3.40" - } -} diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok/default.nix similarity index 94% rename from pkgs/tools/networking/ngrok-2/default.nix rename to pkgs/tools/networking/ngrok/default.nix index 6093cea40f07..774f2dad456c 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { homepage = "https://ngrok.com/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = [ maintainers.bobvanderlinden ]; + maintainers = with maintainers; [ bobvanderlinden brodes ]; }; } diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/pkgs/tools/networking/ngrok/update.sh similarity index 90% rename from pkgs/tools/networking/ngrok-2/update.sh rename to pkgs/tools/networking/ngrok/update.sh index 4e2aaf4e5596..ed2d975bee2f 100755 --- a/pkgs/tools/networking/ngrok-2/update.sh +++ b/pkgs/tools/networking/ngrok/update.sh @@ -10,7 +10,7 @@ get_download_info() { https://update.equinox.io/check \ 'Accept:application/json; q=1; version=1; charset=utf-8' \ 'Content-Type:application/json; charset=utf-8' \ - app_id=app_goVRodbMVm \ + app_id=app_c3U4eZcDbjV \ channel=stable \ os=$1 \ goarm= \ @@ -31,4 +31,4 @@ get_download_info() { get_download_info darwin amd64 get_download_info darwin arm64 ) | jq --slurp 'map ({ (.sys): . }) | add' \ - > pkgs/tools/networking/ngrok-2/versions.json + > pkgs/tools/networking/ngrok/versions.json diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json new file mode 100644 index 000000000000..0ee279a88826 --- /dev/null +++ b/pkgs/tools/networking/ngrok/versions.json @@ -0,0 +1,38 @@ +{ + "linux-386": { + "sys": "linux-386", + "url": "https://bin.equinox.io/a/fZXabEBxqTt/ngrok-v3-3.0.4-linux-386", + "sha256": "94c106392171a537d45ff5db749ce064d721b7c2204c7c951b9e9bfd96fd41f5", + "version": "3.0.4" + }, + "linux-amd64": { + "sys": "linux-amd64", + "url": "https://bin.equinox.io/a/fydLsfbG16K/ngrok-v3-3.0.4-linux-amd64", + "sha256": "1d93dfcbcf8f1be3a21460022b5644228f9dcc2e71012bd61fcfb39ddf2a7a89", + "version": "3.0.4" + }, + "linux-arm": { + "sys": "linux-arm", + "url": "https://bin.equinox.io/a/8Fzm6mvbW6H/ngrok-v3-3.0.4-linux-arm", + "sha256": "d9bf182808f254bea7f177f7dc814dbfa0f3a5ee2aea18cfabac7975a9c6397e", + "version": "3.0.4" + }, + "linux-arm64": { + "sys": "linux-arm64", + "url": "https://bin.equinox.io/a/NGErr1qsBJ/ngrok-v3-3.0.4-linux-arm64", + "sha256": "26174fa2a0c22cf44fff118658348d6e4bfa8d60e4cfc092dedc4a0223427916", + "version": "3.0.4" + }, + "darwin-amd64": { + "sys": "darwin-amd64", + "url": "https://bin.equinox.io/a/RZEPEGHd2t/ngrok-v3-3.0.4-darwin-amd64", + "sha256": "a7eca7635e6174174880a79d51e2d9c4ec32e15752751d5427f70ecf59f9f8e2", + "version": "3.0.4" + }, + "darwin-arm64": { + "sys": "darwin-arm64", + "url": "https://bin.equinox.io/a/dxEFAXR7WZr/ngrok-v3-3.0.4-darwin-arm64", + "sha256": "6db91466407e9538a4f598cc362e8be292d4621f8b331e0d0818e1c672decc66", + "version": "3.0.4" + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 618c7c1fcc24..10b21df8f0c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8675,9 +8675,7 @@ with pkgs; neuron-notes = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); - ngrok = ngrok-2; - - ngrok-2 = callPackage ../tools/networking/ngrok-2 { }; + ngrok = callPackage ../tools/networking/ngrok { }; nifi = callPackage ../servers/web-apps/nifi { };