Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit d2b7f4ad5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      maintainers/maintainer-list.nix
  2. 12
      nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
  3. 2
      nixos/doc/manual/release-notes/rl-2211.section.md
  4. 2
      nixos/lib/testing/call-test.nix
  5. 8
      pkgs/applications/audio/pithos/default.nix
  6. 50
      pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json
  7. 3
      pkgs/applications/editors/vim/plugins/overrides.nix
  8. 2
      pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix
  9. 20
      pkgs/applications/networking/browsers/chromium/upstream-info.json
  10. 6
      pkgs/applications/networking/cluster/terraform/default.nix
  11. 4
      pkgs/applications/networking/instant-messengers/cinny/default.nix
  12. 9
      pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
  13. 8
      pkgs/applications/networking/instant-messengers/element/pin.json
  14. 4
      pkgs/applications/networking/instant-messengers/nheko/default.nix
  15. 19
      pkgs/applications/video/epgstation/default.nix
  16. 2
      pkgs/applications/video/epgstation/package.json
  17. 4
      pkgs/applications/video/epgstation/update.nix
  18. 6
      pkgs/applications/virtualization/docker/compose.nix
  19. 59
      pkgs/applications/virtualization/pods/default.nix
  20. 9
      pkgs/data/themes/orchis-theme/default.nix
  21. 4
      pkgs/development/libraries/gtk/4.x.nix
  22. 4
      pkgs/development/libraries/gtkmm/4.x.nix
  23. 4
      pkgs/development/libraries/libadwaita/default.nix
  24. 65
      pkgs/development/libraries/libpanel/default.nix
  25. 2
      pkgs/development/node-packages/composition.nix
  26. 2
      pkgs/development/node-packages/generate.sh
  27. 106
      pkgs/development/node-packages/node-env.nix
  28. 15484
      pkgs/development/node-packages/node-packages.nix
  29. 69
      pkgs/development/node-packages/overrides.nix
  30. 41
      pkgs/development/python-modules/hatch-nodejs-version/default.nix
  31. 4
      pkgs/development/python-modules/types-pyyaml/default.nix
  32. 4
      pkgs/development/python-modules/types-redis/default.nix
  33. 4
      pkgs/development/python-modules/types-urllib3/default.nix
  34. 10
      pkgs/development/tools/build-managers/scala-cli/sources.json
  35. 12
      pkgs/games/enyo-launcher/default.nix
  36. 38
      pkgs/servers/mx-puppet-discord/default.nix
  37. 22
      pkgs/servers/mx-puppet-discord/generate.sh
  38. 2
      pkgs/servers/mx-puppet-discord/node-composition.nix
  39. 2224
      pkgs/servers/mx-puppet-discord/node-packages.nix
  40. 15
      pkgs/tools/graphics/ldgallery/compiler/default.nix
  41. 11
      pkgs/tools/graphics/ldgallery/viewer/default.nix
  42. 7
      pkgs/tools/graphics/ldgallery/viewer/generate.sh
  43. 2
      pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
  44. 12897
      pkgs/tools/graphics/ldgallery/viewer/node-packages.nix
  45. 4
      pkgs/tools/misc/gh-dash/default.nix
  46. 2
      pkgs/top-level/aliases.nix
  47. 39
      pkgs/top-level/all-packages.nix
  48. 2
      pkgs/top-level/python-packages.nix

@ -13885,6 +13885,12 @@
githubId = 120451;
name = "Urban Skudnik";
};
usrfriendly = {
name = "Arin Lares";
email = "arinlares@gmail.com";
github = "usrfriendly";
githubId = 2502060;
};
utdemir = {
email = "me@utdemir.com";
github = "utdemir";

@ -772,6 +772,18 @@
which no longer has a downgrade path to releases 1.2 or older.
</para>
</listitem>
<listitem>
<para>
The <literal>nodePackages</literal> package set now defaults
to the LTS release in the <literal>nodejs</literal> package
again, instead of being pinned to
<literal>nodejs-14_x</literal>. Several updates to node2nix
have been made for compatibility with newer Node.js and npm
versions and a new <literal>postRebuild</literal> hook has
been added for packages to perform extra build steps before
the npm install step prunes dev dependencies.
</para>
</listitem>
</itemizedlist>
</section>
</section>

@ -254,4 +254,6 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older.
- The `nodePackages` package set now defaults to the LTS release in the `nodejs` package again, instead of being pinned to `nodejs-14_x`. Several updates to node2nix have been made for compatibility with newer Node.js and npm versions and a new `postRebuild` hook has been added for packages to perform extra build steps before the npm install step prunes dev dependencies.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

@ -10,7 +10,7 @@ in
};
result = mkOption {
internal = true;
default = config;
default = config.test;
};
};
}

@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
pname = "pithos";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "03j04b1mk2fq0ni2ydpw40fdd36k545z8a1pq9x5c779080cwpla";
hash = "sha256-cFmsdQXfGxgpKe32dw1lgoANU9Drhu5Mecyz37BVP4g=";
};
format = "other";
@ -22,6 +22,10 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ];
propagatedNativeBuildInputs = [
gobject-introspection
];
propagatedBuildInputs =
[ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++
(with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++

@ -1,18 +1,48 @@
{
"name": "markdown-preview-vim",
"version": "0.0.1",
"name": "markdown-preview",
"version": "0.0.10",
"description": "markdown preview plugin for (neo)vim",
"bin": "./index.js",
"repository": "https://github.com/iamcco/markdown-preview.vim.git",
"bin": "./app/server.js",
"repository": "https://github.com/iamcco/markdown-preview.nvim.git",
"author": "年糕小豆汤 <ooiss@qq.com>",
"license": "MIT",
"private": true,
"scripts": {
"watch": "tsc -w -p ./",
"build-app": "cd app && rm -rf ./.next && next build && next export",
"build-lib": "tsc -p ./",
"build": "tsc -p ./ && cd app && rm -rf ./.next && next build && next export && yarn && pkg --targets node16-linux-x64,node16-macos-x64,node16-win-x64 --out-path ./bin . && rm -rf ./node_modules ./.next"
},
"dependencies": {
"@chemzqm/neovim": "5.7.9",
"log4js": "3.0.6",
"neovim": "4.2.1",
"socket.io": "2.1.1",
"tslib": "1.9.3",
"vim-node-rpc": "0.1.24"
"@chemzqm/neovim": "^5.7.9",
"chart.js": "^2.7.3",
"highlight.js": "^10.4.1",
"log4js": "^6.4.0",
"markdown-it": "^12.3.2",
"markdown-it-anchor": "^5.2.4",
"markdown-it-deflist": "^2.0.3",
"markdown-it-emoji": "^1.4.0",
"markdown-it-footnote": "^3.0.1",
"markdown-it-task-lists": "^2.1.1",
"markdown-it-toc-done-right": "^4.0.1",
"md-it-meta": "^0.0.2",
"msgpack-lite": "^0.1.26",
"next": "^7.0.2",
"next-routes": "^1.4.2",
"plantuml-encoder": "^1.4.0",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"socket.io": "^2.1.1",
"socket.io-client": "^2.1.1"
},
"devDependencies": {
"@types/node": "16",
"pkg": "^5.6.0",
"prettier": "^2.6.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.3.0",
"typescript": "^4.6.4",
"yuuko-tsconfig": "^1.0.0"
}
}

@ -553,8 +553,7 @@ self: super: {
})
];
postInstall = ''
# The node package name is `*-vim` not `*-nvim`.
ln -s ${nodeDep}/lib/node_modules/markdown-preview-vim/node_modules $out/app
ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app
'';
nativeBuildInputs = [ nodejs ];

@ -48,7 +48,7 @@ let
];
# Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
postInstall = ''
postRebuild = ''
jq '
.version = $ENV.version |
.releaseTag = $ENV.releaseTag |

@ -1,21 +1,21 @@
{
"stable": {
"version": "105.0.5195.125",
"sha256": "0rhay46fnfffqcpk6c856hj414508fmhda600lz5whcacr25q6r0",
"sha256bin64": "14knj758nzihs4yh6gb6w0l4i985cnrd0y5hdmz3yd49n9a7s5hv",
"version": "106.0.5249.61",
"sha256": "15qljfg8w124yp65srp1rz3ywrlqhzqzkhimn1h9xz0jkf9cnypj",
"sha256bin64": "0l0vxlv8gmd655z2889549iafnyd4gyknqfal5iaqdhvig3sdp07",
"deps": {
"gn": {
"version": "2022-07-11",
"version": "2022-08-11",
"url": "https://gn.googlesource.com/gn",
"rev": "9ef321772ecc161937db69acb346397e0ccc484d",
"sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng"
"rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
}
},
"chromedriver": {
"version": "105.0.5195.52",
"sha256_linux": "063k766d95ssngg0rlx3c8w9157miga2k9kwig2fbdn7qs5ch764",
"sha256_darwin": "0rs8g25p0v3krbj00jwh5fy2nw5anrr2dzxaxaj1c8ph6qn9iqn0",
"sha256_darwin_aarch64": "14v5r4s2c76md09wgpd3mhfhnw5y57dqkq1iqajgahgqmvvim1by"
"version": "106.0.5249.21",
"sha256_linux": "0z4m5145s00dycb7f7nscwghzwqym4if6k95w0q6d1hjyih8jh32",
"sha256_darwin": "1jnwaim2p579p1xlh9y2w11rp5agmp2144ipjs1fg9p97hrdi3yf",
"sha256_darwin_aarch64": "13wl55n54ld6nrmy1vallrqkzz031kzmw4sjwczra6k7ryd4z09w"
}
},
"beta": {

@ -168,9 +168,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.3.0";
sha256 = "1bl2d1wzarhglfc2vxg4m080d6z5mm35h3i4vg7n93wj9x3wkkq8";
vendorSha256 = "1kjbrwn6k0fycal8g189pda1w3qyjzfk2qjvm1fyj60dr155gncw";
version = "1.3.1";
sha256 = "sha256-ugdMpp/YTCyXaUY6NTrIa9r/+C4bYLYqQEic4cvgoVo=";
vendorSha256 = "sha256-+m7e49yN7OkiQQVvqimF0Tvz5wUr2M5bxs3yBU2lt7Y=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
pname = "cinny";
version = "2.2.0";
version = "2.2.2";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
sha256 = "sha256-wwMNb3WBW/I72MXfeYdUZzE/z9YgPFdRbq/F0AdKf9Q=";
sha256 = "sha256-MNmU6MvDwGbFNQt7qe08klXjy1n2LiABlPkARGvjVJU=";
};
installPhase = ''

@ -73,16 +73,13 @@ in nodePackages.deltachat-desktop.override rec {
USE_SYSTEM_LIBDELTACHAT = "true";
VERSION_INFO_GIT_REF = src.rev;
preRebuild = ''
substituteInPlace package.json \
--replace "node ./bin/check-nodejs-version.js" true
'';
postInstall = ''
postRebuild = ''
rm -r node_modules/deltachat-node/node/prebuilds
npm run build4production
'';
postInstall = ''
npm prune --production
install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \

@ -1,7 +1,7 @@
{
"version": "1.11.7",
"desktopSrcHash": "0UwcA+i4vmtrmF50O+8Bfzc9n5i1O+/iQYHG3lLerUY=",
"version": "1.11.8",
"desktopSrcHash": "l6IwztPEPSo3WgdUBPO4ZNgfoLts8NaqvoHekAhfVGg=",
"desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc",
"webSrcHash": "nJo60QJWhmkyrkHo3VpNspoPvmq+lpRwhNelieqrzto=",
"webYarnHash": "1lar5bqkl1d33625phz91r9yxn5hxpf2wg850xzym58kcsdyp1ci"
"webSrcHash": "Etxlq2TEaZM9Qz4ig5H00DsshJoFH6+wtt+RL1dR2n4=",
"webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0"
}

@ -33,13 +33,13 @@
mkDerivation rec {
pname = "nheko";
version = "0.10.1-1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "Nheko-Reborn";
repo = "nheko";
rev = "v${version}";
sha256 = "sha256-Bpf38BAGfvmVyrAptIsQ9HaRUopqvytko6unlWLooUo=";
sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ=";
};
nativeBuildInputs = [

@ -6,7 +6,6 @@
, makeWrapper
, bash
, nodejs
, nodePackages
, gzip
, jq
, yq
@ -23,18 +22,17 @@ let
sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig=";
};
client = nodePackages.epgstation-client.override (drv: {
# FIXME: remove this option if possible
#
# Unsetting this option resulted NPM attempting to re-download packages.
dontNpmInstall = true;
client = nodejs.pkgs.epgstation-client.override (drv: {
# This is set to false to keep devDependencies at build time. Build time
# dependencies are pruned afterwards.
production = false;
meta = drv.meta // {
inherit (nodejs.meta) platforms;
};
});
server = nodePackages.epgstation.override (drv: {
server = nodejs.pkgs.epgstation.override (drv: {
inherit src;
# This is set to false to keep devDependencies at build time. Build time
@ -47,6 +45,9 @@ let
];
preRebuild = ''
# Fix for OpenSSL compat with newer Node.js
export NODE_OPTIONS=--openssl-legacy-provider
# Fix for not being able to connect to mysql using domain sockets.
patch -p1 < ${./use-mysql-over-domain-socket.patch}
@ -64,8 +65,8 @@ let
pushd $out/lib/node_modules/epgstation
cp -r ${client}/lib/node_modules/epgstation-client/node_modules client/node_modules
chmod -R u+w client/node_modules
cp -r ${client}/lib/node_modules/epgstation-client/{package-lock.json,node_modules} client/
chmod -R u+w client/{package-lock.json,node_modules}
npm run build

@ -35,7 +35,7 @@
"reflect-metadata": "0.1.13",
"socket.io": "4.3.1",
"source-map-support": "0.5.20",
"sqlite3": "5.0.2",
"sqlite3": "5.0.11",
"swagger-ui-dist": "3.52.5",
"typeorm": "0.2.38",
"url-join": "4.0.1",

@ -6,6 +6,7 @@
, writers
, jq
, yq
, gnused
}:
let
@ -45,6 +46,9 @@ in writers.writeBash "update-epgstation" ''
"$SRC/client/package.json" \
> client/package.json
# Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x
${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json
# Regenerate node packages to update the pre-overriden epgstation derivation.
# This must come *after* package.json has been regenerated.
pushd ../../../development/node-packages

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.11.1";
version = "2.11.2";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-S7mRSpqZTL38YlYHqtXdib7LZqodfEFqdAB98sAXOkA=";
sha256 = "sha256-L43BIkRaPAU0zgdVsf1a3OinbspiU0LfWZPssS91wTE=";
};
vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY=";
vendorSha256 = "sha256-PZumm//BV9iAkq1Kb9xNenqVrx73ZZUHTCUSVNqqEXA=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchFromGitHub
, desktop-file-utils
, glib
, gtk4
, meson
, ninja
, pkg-config
, rustPlatform
, wrapGAppsHook
, gtksourceview5
, libadwaita
}:
stdenv.mkDerivation rec {
pname = "pods";
version = "1.0.0-beta.4";
src = fetchFromGitHub {
owner = "marhkb";
repo = pname;
rev = "v${version}";
sha256 = "1j5rz43860n17qcxmc5dj8sll3y593jj9zz1sfvnx4g0694sp0cl";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-tj0ROO8HmFWyQLYDrdywOneHz6X43dRZJFTB+aw+m7o=";
};
nativeBuildInputs = [
desktop-file-utils
glib
gtk4
meson
ninja
pkg-config
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
wrapGAppsHook
];
buildInputs = [
gtk4
gtksourceview5
libadwaita
];
meta = with lib; {
description = "A podman desktop application";
homepage = "https://github.com/marhkb/pods";
license = licenses.gpl3Only;
maintainers = with maintainers; [ figsoda ];
platforms = platforms.linux;
};
}

@ -5,6 +5,7 @@
, gnome-themes-extra
, gtk-engine-murrine
, sassc
, border-radius ? null # Suggested: 2 < value < 16
, tweaks ? [ ] # can be "solid" "compact" "black" "primary"
, withWallpapers ? false
}:
@ -21,13 +22,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) ''
stdenvNoCC.mkDerivation
rec {
pname = "orchis-theme";
version = "2022-07-20";
version = "2022-09-28";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "sha256-0T9D42XwyvIb5XeXdqXbyahVHNcSeT469lSgWSisNvA=";
sha256 = "sha256-gabOn5ErJjDgqZCyIboMgFb1FqmDw8dljIskBENKTBg=";
};
nativeBuildInputs = [ gtk3 sassc ];
@ -42,7 +43,9 @@ rec {
installPhase = ''
runHook preInstall
bash install.sh -d $out/share/themes -t all ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks}
bash install.sh -d $out/share/themes -t all \
${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
${lib.optionalString (!isNull border-radius) ("--round " + builtins.toString border-radius + "px")}
${lib.optionalString withWallpapers ''
mkdir -p $out/share/backgrounds
cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds

@ -63,7 +63,7 @@ in
stdenv.mkDerivation rec {
pname = "gtk4";
version = "4.8.0";
version = "4.8.1";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev";
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
sha256 = "yNYgNDfR41nYMSTcWRVG1AP2fjsAVE5T3VCpuqzcvX8=";
sha256 = "XOjY3piiO9DI7KGmEJThwAm18AncvWC0XpkKjbG3Qv0=";
};
depsBuildBuild = [

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "gtkmm";
version = "4.6.1";
version = "4.8.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "DV7+yp7GT91TC7gibGMQrJlUmz3ZYE1uNnY5eRrz0eA=";
sha256 = "yCeG1G4rBzRrY5fKfxkp2VL0ki+lyds97ghJi5oTbPU=";
};
nativeBuildInputs = [

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "libadwaita";
version = "1.1.4";
version = "1.2.0";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "libadwaita";
rev = version;
hash = "sha256-xxnLgPKPOND/ITvDC6SOD2GlkzlIX3BzBbt6p2AEjgY=";
hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U=";
};
depsBuildBuild = [

@ -0,0 +1,65 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, pkg-config
, gobject-introspection
, vala
, gi-docgen
, glib
, gtk4
, libadwaita
, gnome
}:
stdenv.mkDerivation rec {
pname = "libpanel";
version = "1.0.1";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "hBtqtx6wcv1lIAI+H3Gqx/8lDGbq37sXyVXaa/QeIwY=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gobject-introspection
vala
gi-docgen
];
buildInputs = [
glib
gtk4
libadwaita
];
mesonFlags = [
"-Dinstall-examples=true"
];
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
};
};
meta = with lib; {
description = "Dock/panel library for GTK 4";
homepage = "https://gitlab.gnome.org/GNOME/libpanel";
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
};
}

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
let
nodeEnv = import ./node-env.nix {

@ -13,7 +13,7 @@ rm -f ./node-env.nix
-i node-packages.json \
-o node-packages.nix \
-c composition.nix \
--pkg-name nodejs-14_x
--pkg-name nodejs-18_x
# using --no-out-link in nix-build argument would cause the
# gc to run before the script finishes

@ -165,7 +165,11 @@ let
if(process.argv[2] == "development") {
replaceDependencies(packageObj.devDependencies);
}
else {
packageObj.devDependencies = {};
}
replaceDependencies(packageObj.optionalDependencies);
replaceDependencies(packageObj.peerDependencies);
/* Write the fixed package.json file */
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
@ -270,7 +274,7 @@ let
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
reconstructPackageLock = writeTextFile {
name = "addintegrityfields.js";
name = "reconstructpackagelock.js";
text = ''
var fs = require('fs');
var path = require('path');
@ -280,25 +284,43 @@ let
var lockObj = {
name: packageObj.name,
version: packageObj.version,
lockfileVersion: 1,
lockfileVersion: 2,
requires: true,
packages: {
"": {
name: packageObj.name,
version: packageObj.version,
license: packageObj.license,
bin: packageObj.bin,
dependencies: packageObj.dependencies,
engines: packageObj.engines,
optionalDependencies: packageObj.optionalDependencies
}
},
dependencies: {}
};
function augmentPackageJSON(filePath, dependencies) {
function augmentPackageJSON(filePath, packages, dependencies) {
var packageJSON = path.join(filePath, "package.json");
if(fs.existsSync(packageJSON)) {
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
packages[filePath] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: packageObj.dependencies,
engines: packageObj.engines,
optionalDependencies: packageObj.optionalDependencies
};
dependencies[packageObj.name] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: {}
};
processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
}
}
function processDependencies(dir, dependencies) {
function processDependencies(dir, packages, dependencies) {
if(fs.existsSync(dir)) {
var files = fs.readdirSync(dir);
@ -314,23 +336,84 @@ let
pkgFiles.forEach(function(entry) {
if(stats.isDirectory()) {
var pkgFilePath = path.join(filePath, entry);
augmentPackageJSON(pkgFilePath, dependencies);
augmentPackageJSON(pkgFilePath, packages, dependencies);
}
});
} else {
augmentPackageJSON(filePath, dependencies);
augmentPackageJSON(filePath, packages, dependencies);
}
}
});
}
}
processDependencies("node_modules", lockObj.dependencies);
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
'';
};
# Script that links bins defined in package.json to the node_modules bin directory
# NPM does not do this for top-level packages itself anymore as of v7
linkBinsScript = writeTextFile {
name = "linkbins.js";
text = ''
var fs = require('fs');
var path = require('path');
var packageObj = JSON.parse(fs.readFileSync("package.json"));
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
if(packageObj.bin !== undefined) {
fs.mkdirSync(path.join(nodeModules, ".bin"))
if(typeof packageObj.bin == "object") {
Object.keys(packageObj.bin).forEach(function(exe) {
if(fs.existsSync(packageObj.bin[exe])) {
console.log("linking bin '" + exe + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.bin[exe]),
path.join(nodeModules, ".bin", exe)
);
}
else {
console.log("skipping non-existent bin '" + exe + "'");
}
})
}
else {
if(fs.existsSync(packageObj.bin)) {
console.log("linking bin '" + packageObj.bin + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.bin),
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
);
}
else {
console.log("skipping non-existent bin '" + packageObj.bin + "'");
}
}
}
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
fs.mkdirSync(path.join(nodeModules, ".bin"))
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
console.log("linking bin '" + exe + "'");
fs.symlinkSync(
path.join("..", packageObj.name, packageObj.directories.bin, exe),
path.join(nodeModules, ".bin", exe)
);
}
else {
console.log("skipping non-existent bin '" + exe + "'");
}
})
}
'';
};
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@ -377,13 +460,18 @@ let
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
runHook postRebuild
if [ "''${dontNpmInstall-}" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
fi
# Link executables defined in package.json
node ${linkBinsScript}
'';
# Builds and composes an NPM package including all its dependencies

File diff suppressed because it is too large Load Diff

@ -9,6 +9,7 @@ let
callPackage
fetchFromGitHub
fetchurl
fetchpatch
nixosTests;
since = version: lib.versionAtLeast nodejs.version version;
@ -38,7 +39,7 @@ final: prev: {
];
};
"@medable/mdctl-cli" = prev."@medable/mdctl-cli".override {
"@medable/mdctl-cli" = prev."@medable/mdctl-cli".override (oldAttrs: {
nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [
glib
libsecret
@ -52,7 +53,9 @@ final: prev: {
final.node-pre-gyp
nodejs
];
};
meta = oldAttrs.meta // { broken = since "16"; };
});
mdctl-cli = final."@medable/mdctl-cli";
autoprefixer = prev.autoprefixer.override {
@ -90,6 +93,8 @@ final: prev: {
bitwarden-cli = prev."@bitwarden/cli".override {
name = "bitwarden-cli";
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [ pixman cairo pango ];
};
bower2nix = prev.bower2nix.override {
@ -132,7 +137,8 @@ final: prev: {
# NOTE: this is a stub package to fetch npm dependencies for
# ../../applications/video/epgstation
epgstation = prev."epgstation-../../applications/video/epgstation".override (oldAttrs: {
buildInputs = [ final.node-pre-gyp final.node-gyp-build ];
buildInputs = [ pkgs.postgresql ];
nativeBuildInputs = [ final.node-pre-gyp final.node-gyp-build pkgs.which ];
meta = oldAttrs.meta // { platforms = lib.platforms.none; };
});
@ -158,6 +164,13 @@ final: prev: {
'';
};
fauna-shell = prev.fauna-shell.override {
# printReleaseNotes just pulls them from GitHub which is not allowed in sandbox
preRebuild = ''
sed -i 's|"node ./tools/printReleaseNotes"|"true"|' node_modules/faunadb/package.json
'';
};
flood = prev.flood.override {
buildInputs = [ final.node-pre-gyp ];
};
@ -185,7 +198,7 @@ final: prev: {
ijavascript = prev.ijavascript.override (oldAttrs: {
preRebuild = ''
export NPM_CONFIG_ZMQ_EXTERNAL=true
export npm_config_zmq_external=true
'';
buildInputs = oldAttrs.buildInputs ++ [ final.node-gyp-build pkgs.zeromq ];
});
@ -208,6 +221,10 @@ final: prev: {
libsecret
final.node-gyp-build
final.node-pre-gyp
pixman
cairo
pango
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
@ -227,6 +244,15 @@ final: prev: {
'';
};
keyoxide = prev.keyoxide.override {
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [
pixman
cairo
pango
];
};
makam = prev.makam.override {
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postFixup = ''
@ -295,16 +321,23 @@ final: prev: {
};
node2nix = prev.node2nix.override {
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
# We need to use master because of a fix that replaces git:// url to https://.
# Get latest commit for misc fixes
src = fetchFromGitHub {
owner = "svanderburg";
repo = "node2nix";
rev = "68f5735f9a56737e3fedceb182705985e3ab8799";
sha256 = "sha256-NK6gDTkGx0GG7yPTwgtFC4ttQZPfcLaLp8W8OOMO6bg=";
rev = "026360084db8a27095aafdac7125d7f1a93046c8";
sha256 = "sha256-zO/xGG10v7HGv58RLX5SFd7QOXAL2vRxCRM8IfRZ8JA=";
};
postInstall = ''
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = let
# Needed to fix Node.js 16+ - PR svanderburg/node2nix#302
npmPatch = fetchpatch {
name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch";
url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch";
hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8=";
};
in ''
patch -d $out/lib/node_modules/node2nix -p1 < ${npmPatch}
wrapProgram "$out/bin/node2nix" --prefix PATH : ${lib.makeBinPath [ pkgs.nix ]}
'';
};
@ -440,7 +473,7 @@ final: prev: {
};
tedicross = prev."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
nativeBuildInputs = with pkgs; [ makeWrapper libtool autoconf ];
postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
--add-flags "$out/lib/node_modules/tedicross/main.js"
@ -467,10 +500,18 @@ final: prev: {
thelounge-theme-flat-blue = prev.thelounge-theme-flat-blue.override {
nativeBuildInputs = [ final.node-pre-gyp ];
# TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x)
preRebuild = ''
rm -r node_modules/node-gyp
'';
};
thelounge-theme-flat-dark = prev.thelounge-theme-flat-dark.override {
nativeBuildInputs = [ final.node-pre-gyp ];
# TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x)
preRebuild = ''
rm -r node_modules/node-gyp
'';
};
triton = prev.triton.override {
@ -555,12 +596,6 @@ final: prev: {
};
wrangler = prev.wrangler.override (oldAttrs: {
dontNpmInstall = true;
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = ''
makeWrapper "$out/lib/node_modules/wrangler/bin/wrangler.js" "$out/bin/wrangler" \
--inherit-argv0
'';
meta = oldAttrs.meta // { broken = before "16.13"; };
});

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, hatchling
}:
buildPythonPackage rec {
pname = "hatch-nodejs-version";
version = "0.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "agoose77";
repo = "hatch-nodejs-version";
rev = "v${version}";
sha256 = "sha256-TBvqXjka8poQ8xxQ/H1hFYRLqnP1024uan1d9b95ags=";
};
propagatedBuildInputs = [
hatchling
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"hatch_nodejs_version"
];
meta = with lib; {
description = "Plugins for dealing with NodeJS versions";
homepage = "https://github.com/agoose77/hatch-nodejs-version";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
}

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pyyaml";
version = "6.0.11";
version = "6.0.12";
format = "setuptools";
src = fetchPypi {
pname = "types-PyYAML";
inherit version;
sha256 = "sha256-f32i/RHpvB5enrPqG+hPSEl0cBeln8Lu4Oo07RFHwuA=";
sha256 = "sha256-9vNQQYElhy8/BAnZamKlpc60UjGvXMB+4ANOxIo8gvo=";
};
# Module doesn't have tests

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.3.20";
version = "4.3.21";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-dO0ClFRw3eot0hRHwYXauzFp5aUyjSayXPNUfZSbjgQ=";
sha256 = "sha256-/QF6ZzOvGT0U8bsptP95wKvJBuhlQVjRerpFemOBr+I=";
};
# Module doesn't have tests

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-urllib3";
version = "1.26.24";
version = "1.26.25";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-obOq6n3aPrG1Fpnucjqt0jVIjk3EZI4DDwm8Qp7P9C8=";
hash = "sha256-Wu8OZjck7vkkr6izILYv/vLBc2wfpsrs/JvGyK4sPe8=";
};
# Module doesn't have tests

@ -1,13 +1,17 @@
{
"version": "0.1.14",
"version": "0.1.15",
"assets": {
"aarch64-darwin": {
"asset": "scala-cli-aarch64-apple-darwin.gz",
"sha256": "17zc0fd83r8wsj9bf448f1y0s5plp3xdkqh2qbfsqak4jk4f22jn"
},
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
"sha256": "1h20bd8rabpxgjp6czbn9m5yhmz77vkvpbsxmnf6src942ihb7sn"
"sha256": "1c3znwad91czfvym82g4hbh96ny8wnhjcqshj6zchvzdh8c1xiqm"
},
"x86_64-linux": {
"asset": "scala-cli-x86_64-pc-linux.gz",
"sha256": "1n4f920qpwhnarky1dh79sk1r3ayriinf4ah53704xvscc083c70"
"sha256": "0s193bkh1b431hbdfa9fnw3id6p57byy8n10v3s15sk5yi96jl87"
}
}
}

@ -1,14 +1,14 @@
{ mkDerivation, lib, fetchFromGitLab, cmake, qtbase }:
mkDerivation rec {
pname = "enyo-doom";
version = "2.0.2";
pname = "enyo-launcher";
version = "2.0.5";
src = fetchFromGitLab {
owner = "sdcofer70";
repo = "enyo-doom";
repo = "enyo-launcher";
rev = version;
sha256 = "1s1vpwrrpb9c7r2b0k1j7dlsfasfzmi6prcwql4mxwixrl7f8ms1";
sha256 = "sha256-qdVP5QN2t0GK4VBWuFGrnRfgamQDZGRjwaAe6TIK604=";
};
nativeBuildInputs = [ cmake ];
@ -16,10 +16,10 @@ mkDerivation rec {
buildInputs = [ qtbase ];
meta = {
homepage = "https://gitlab.com/sdcofer70/enyo-doom";
homepage = "https://gitlab.com/sdcofer70/enyo-launcher";
description = "Frontend for Doom engines";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.tadfisher ];
maintainers = [ lib.maintainers.usrfriendly ];
};
}

@ -1,14 +1,17 @@
{ stdenv, fetchFromGitHub, pkgs, lib, nodejs-14_x, nodePackages, pkg-config, libjpeg
, pixman, cairo, pango }:
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs-14_x, pkg-config
, libjpeg, pixman, cairo, pango, which, postgresql }:
let
nodejs = nodejs-14_x;
# No official version ever released
src = fetchFromGitHub {
owner = "matrix-discord";
version = "0.1.1";
src = fetchFromGitLab {
group = "mx-puppet";
owner = "discord";
repo = "mx-puppet-discord";
rev = "bb6438a504182a7a64048b992179427587ccfded";
sha256 = "0g2p5xwxxgvlnq0fg0x4q9x4asqyppdv6b5z6bvncm62kc70z6xk";
rev = "v${version}";
hash = "sha256-ZhyjUt6Bz/0R4+Lq/IoY9rNjdwVE2qp4ZQLc684+T/0=";
};
myNodePackages = import ./node-composition.nix {
@ -17,25 +20,22 @@ let
};
in myNodePackages.package.override {
pname = "mx-puppet-discord";
version = "2021-08-01";
inherit src;
inherit version src;
nativeBuildInputs = [ nodePackages.node-pre-gyp pkg-config ];
buildInputs = [ libjpeg pixman cairo pango ];
nativeBuildInputs = [ nodejs.pkgs.node-pre-gyp nodejs.pkgs.node-gyp-build pkg-config which ];
buildInputs = [ libjpeg pixman cairo pango postgresql ];
postInstall = ''
# Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems
patchShebangs --build "$out/lib/node_modules/mx-puppet-discord/node_modules/"
# compile Typescript sources
postRebuild = ''
# Build typescript stuff
npm run build
'';
postInstall = ''
# Make an executable to run the server
mkdir -p $out/bin
cat <<EOF > $out/bin/mx-puppet-discord
#!/bin/sh
exec ${nodejs}/bin/node $out/lib/node_modules/mx-puppet-discord/build/index.js "\$@"
exec ${nodejs}/bin/node $out/lib/node_modules/@mx-puppet/discord/build/index.js "\$@"
EOF
chmod +x $out/bin/mx-puppet-discord
'';
@ -43,7 +43,7 @@ in myNodePackages.package.override {
meta = with lib; {
description = "A discord puppeting bridge for matrix";
license = licenses.asl20;
homepage = "https://github.com/matrix-discord/mx-puppet-discord";
homepage = "https://gitlab.com/mx-puppet/discord/mx-puppet-discord";
maintainers = with maintainers; [ expipiplus1 ];
platforms = platforms.unix;
};

@ -1,22 +1,24 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
# No official release
rev=bb6438a504182a7a64048b992179427587ccfded
u=https://raw.githubusercontent.com/matrix-discord/mx-puppet-discord/$rev
# Download package.json and package-lock.json
curl -O $u/package.json
curl $u/package-lock.json |
sed -e 's|git+ssh://git@|git+https://|g' > package-lock.json
tag="v0.1.1"
u="https://gitlab.com/mx-puppet/discord/mx-puppet-discord/-/raw/$tag"
# Download package.json and patch in @discordjs/opus optional dependency
curl $u/package.json |
sed 's|"typescript": *"\^\?3\.[^"]*"|"typescript": "^4.8.3"|' | # TODO: remove when newer typescript version pinned
sed 's|\("dependencies": *{\)|\1\n"@discordjs/opus": "^0.8.0",|' >package.json
node2nix \
--nodejs-14 \
--node-env ../../development/node-packages/node-env.nix \
--input package.json \
--lock package-lock.json \
--strip-optional-dependencies \
--output node-packages.nix \
--composition node-composition.nix
--composition node-composition.nix \
--registry https://registry.npmjs.org \
--registry https://gitlab.com/api/v4/packages/npm \
--registry-scope '@mx-puppet'
sed -i 's|<nixpkgs>|../../..|' node-composition.nix
rm -f package.json package-lock.json
rm -f package.json

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import ../../.. {
inherit system;

File diff suppressed because it is too large Load Diff

@ -1,15 +1,15 @@
# generated with cabal2nix by ./generate.sh
{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist
, directory, fetchgit, filepath, Glob, hpack, parallel-io, process
, safe, lib, text, time, yaml
, directory, fetchgit, filepath, Glob, hpack, lib, parallel-io
, process, safe, text, time, yaml
}:
mkDerivation {
pname = "ldgallery-compiler";
version = "2.0";
version = "2.1";
src = fetchgit {
url = "https://github.com/pacien/ldgallery.git";
sha256 = "1a82wy6ns1434gdba2l04crvr5waf03y02bappcxqci2cfb1cznz";
rev = "e93f7b1eb84c083d67567115284c0002a3a7d5fc";
sha256 = "184zysh5qwkbki8mn0br87h65yi5j39qwnmhz05z3ir9wfiniq4b";
rev = "11bbbae2850b9c45da697a8ed9626495a50a38c0";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/compiler; echo source root reset to $sourceRoot";
@ -32,6 +32,7 @@ mkDerivation {
prePatch = "hpack";
homepage = "https://ldgallery.pacien.org";
description = "A static generator which turns a collection of tagged pictures into a searchable web gallery";
license = lib.licenses.agpl3;
maintainers = with lib.maintainers; [ pacien ];
license = lib.licenses.agpl3Only;
mainProgram = "ldgallery";
maintainers = [ lib.maintainers.pacien ];
}

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgs, nodejs-14_x, pandoc, CoreServices }:
{ lib, stdenv, fetchFromGitHub, pkgs, pandoc, CoreServices }:
with lib;
@ -9,16 +9,13 @@ let
sourcePkg = fetchFromGitHub {
owner = "pacien";
repo = "ldgallery";
rev = "v2.0";
sha256 = "1a82wy6ns1434gdba2l04crvr5waf03y02bappcxqci2cfb1cznz";
rev = "v2.1";
sha256 = "sha256-i+Boo+Mpx/EL+LBajtOQJfpi4EF5AVtRnGtyXKD2n6A=";
};
nodePackages = import ./node-composition.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;
# some native node dependencies still require NodeJS 12 with Python 2
nodejs = nodejs-14_x;
};
nodePkg = nodePackages.package.override {
@ -43,7 +40,7 @@ stdenv.mkDerivation {
mkdir -p "$out/share/ldgallery"
cp -rp "lib/node_modules/ldgallery-viewer/dist" \
"$out/share/ldgallery/viewer/"
cp -rp "lib/node_modules/ldgallery-viewer/examples" \
cp -rp "${sourcePkg}/example" \
"$out/share/ldgallery/viewer/"
mkdir -p "$out/share/man/man7"

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix
#!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix wget
# TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once
# * support for npm projects in sub-directories is added to node2nix:
@ -15,16 +15,15 @@ if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
fi
wget https://github.com/pacien/ldgallery/raw/$1/viewer/package.json
wget https://github.com/pacien/ldgallery/raw/$1/viewer/package-lock.json
# Development dependencies are required for this Vue application to build
node2nix \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input ./package.json \
--lock ./package-lock.json \
--output node-packages.nix \
--composition node-composition.nix \
--nodejs-14 \
--no-copy-node-env
rm package.json package-lock.json
rm package.json

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

File diff suppressed because it is too large Load Diff

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gh-dash";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
sha256 = "sha256-fgafubFMYkWEqYVC9aHhheJQO8DnHB9onS1NJ63g74Y=";
sha256 = "sha256-HVGwq3v+VSViPoxeeXRz4F4iyY+auMkP9BdEombalE8=";
};
vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8=";

@ -328,6 +328,8 @@ mapAliases ({
enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22
encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
enyo-doom = enyo-launcher; # Added 2022-09-09
epoxy = libepoxy; # Added 2021-11-11
epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22

@ -6069,7 +6069,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
inherit (nodePackages_latest) wrangler;
inherit (nodePackages) wrangler;
wrangler_1 = callPackage ../development/tools/wrangler_1 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
@ -8523,10 +8523,7 @@ with pkgs;
nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;
nodePackages = (dontRecurseIntoAttrs nodejs.pkgs).override {
# It does not work on 16.x: https://github.com/NixOS/nixpkgs/issues/132456
nodejs = nodejs-14_x;
};
nodePackages = dontRecurseIntoAttrs nodejs.pkgs;
node2nix = nodePackages.node2nix;
@ -10188,6 +10185,20 @@ with pkgs;
podman-tui = callPackage ../applications/virtualization/podman-tui { };
pods = callPackage ../applications/virtualization/pods {
# taken from #182618, remove when merged
libadwaita = libadwaita.overrideAttrs (_: rec {
version = "1.2.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libadwaita";
rev = version;
hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U=";
};
});
};
pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
poedit = callPackage ../tools/text/poedit {
@ -20210,6 +20221,8 @@ with pkgs;
libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
libpanel = callPackage ../development/libraries/libpanel { };
libpar2 = callPackage ../development/libraries/libpar2 { };
libpcap = callPackage ../development/libraries/libpcap { };
@ -27560,7 +27573,9 @@ with pkgs;
epeg = callPackage ../applications/graphics/epeg { };
epgstation = callPackage ../applications/video/epgstation { };
epgstation = callPackage ../applications/video/epgstation {
nodejs = nodejs-16_x;
};
inherit (gnome) epiphany;
@ -28128,16 +28143,6 @@ with pkgs;
fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next {
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
libadwaita = libadwaita.overrideAttrs (finalAtts: rec {
version = "1.2.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "libadwaita";
rev = version;
hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U=";
};
});
};
fragments = callPackage ../applications/networking/p2p/fragments { };
@ -33393,7 +33398,7 @@ with pkgs;
endless-sky = callPackage ../games/endless-sky { };
enyo-doom = libsForQt5.callPackage ../games/enyo-doom { };
enyo-launcher = libsForQt5.callPackage ../games/enyo-launcher { };
eternity = callPackage ../games/eternity-engine { };

@ -4155,6 +4155,8 @@ in {
hatch-vcs = callPackage ../development/python-modules/hatch-vcs { };
hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { };
haversine = callPackage ../development/python-modules/haversine { };
hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };

Loading…
Cancel
Save