Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17812e653d89
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a0d7927a8c72
Choose a head ref
Loading
Showing with 5,481 additions and 610 deletions.
  1. +3 −3 .editorconfig
  2. +12 −0 maintainers/maintainer-list.nix
  3. +13 −4 pkgs/applications/networking/instant-messengers/rambox/pro.nix
  4. +99 −3 pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
  5. +5,155 −507 pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
  6. +8 −10 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
  7. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-web.nix
  8. +3 −3 pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
  9. +51 −35 pkgs/applications/video/handbrake/default.nix
  10. +2 −2 pkgs/data/misc/spdx-license-list-data/default.nix
  11. +2 −2 pkgs/development/libraries/doctest/default.nix
  12. +2 −2 pkgs/development/libraries/freenect/default.nix
  13. +2 −2 pkgs/development/libraries/openvdb/default.nix
  14. +7 −1 pkgs/development/ocaml-modules/batteries/default.nix
  15. +4 −1 pkgs/development/python-modules/tensorflow/1/default.nix
  16. +4 −1 pkgs/development/python-modules/tensorflow/2/default.nix
  17. +4 −5 pkgs/development/tools/hobbes/default.nix
  18. +2 −2 pkgs/development/tools/run/default.nix
  19. +2 −2 pkgs/development/web/nodejs/v14.nix
  20. +2 −2 pkgs/development/web/twitter-bootstrap/default.nix
  21. +33 −0 pkgs/servers/etcd/3.4.nix
  22. +3 −4 pkgs/servers/etcd/default.nix
  23. +2 −2 pkgs/servers/matrix-synapse/default.nix
  24. +2 −2 pkgs/servers/monitoring/telegraf/default.nix
  25. +1 −0 pkgs/tools/X11/xpra/default.nix
  26. +15 −0 pkgs/tools/X11/xpra/fix-41106.patch
  27. +2 −2 pkgs/tools/misc/autorandr/default.nix
  28. +30 −0 pkgs/tools/misc/bashcards/default.nix
  29. +2 −2 pkgs/tools/misc/mutagen/default.nix
  30. +2 −2 pkgs/tools/misc/pgcenter/default.nix
  31. +2 −2 pkgs/tools/networking/pirate-get/default.nix
  32. +2 −2 pkgs/tools/package-management/nfpm/default.nix
  33. +2 −2 pkgs/tools/system/netdata/default.nix
  34. +4 −1 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ charset = utf-8

# Ignore diffs/patches
[*.{diff,patch}]
end_of_line = ignore
insert_final_newline = ignore
trim_trailing_whitespace = ignore
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset

# see https://nixos.org/nixpkgs/manual/#chap-conventions

12 changes: 12 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -4168,6 +4168,12 @@
githubId = 10544;
name = "Giuluo Eulisse";
};
kthielen = {
email = "kthielen@gmail.com";
github = "kthielen";
githubId = 1409287;
name = "Kalani Thielen";
};
ktor = {
email = "kruszewsky@gmail.com";
github = "ktor";
@@ -6640,6 +6646,12 @@
githubId = 1942810;
name = "Christian Ulrich";
};
rpearce = {
email = "me@robertwpearce.com";
github = "rpearce";
githubId = 592876;
name = "Robert W. Pearce";
};
rprospero = {
email = "rprospero+nix@gmail.com";
github = "rprospero";
17 changes: 13 additions & 4 deletions pkgs/applications/networking/instant-messengers/rambox/pro.nix
Original file line number Diff line number Diff line change
@@ -16,22 +16,31 @@ stdenv.mkDerivation rec {
};

installPhase = ''
mkdir -p $out/bin $out/opt/RamboxPro $out/share/applications
asar e resources/app.asar $out/opt/RamboxPro/resources/app.asar.unpacked
ln -s ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps}
asar e resources/app.asar $out/resources
substituteInPlace "$out/resources/dist/electron/main.js" \
--replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:"
cp $desktopItem/share/applications/* $out/share/applications
cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png
cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png
'';

postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \
--add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \
--add-flags "$out/resources --without-update" \
--prefix PATH : ${xdg_utils}/bin
'';

desktopItem = makeDesktopItem {
name = "rambox-pro";
exec = "ramboxpro";
icon = "ramboxpro";
type = "Application";
desktopName = "Rambox Pro";
categories = "Network;";
};

meta = with stdenv.lib; {
Original file line number Diff line number Diff line change
@@ -1,15 +1,111 @@
{
"name": "riot-web",
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.6.0",
"version": "1.6.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
"type": "git",
"url": "https://github.com/vector-im/riot-desktop"
},
"license": "Apache-2.0",
"files": [],
"scripts": {
"mkdirs": "mkdirp packages deploys",
"fetch": "yarn run mkdirs && node scripts/fetch-package.js",
"start": "electron .",
"lint": "eslint src/ scripts/ hak/",
"build:native": "yarn run hak",
"build32": "electron-builder --ia32",
"build64": "electron-builder --x64",
"build": "electron-builder",
"docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
"docker:build:native": "scripts/in-docker.sh yarn run hak",
"docker:build": "scripts/in-docker.sh yarn run build",
"docker:install": "scripts/in-docker.sh yarn install",
"debrepo": "scripts/mkrepo.sh",
"clean": "rimraf webapp.asar dist packages deploys",
"hak": "node scripts/hak/index.js"
},
"dependencies": {
"auto-launch": "^5.0.1",
"electron-store": "^2.0.0",
"electron-window-state": "^4.1.0",
"minimist": "^1.2.0",
"minimist": "^1.2.3",
"png-to-ico": "^1.0.2"
},
"devDependencies": {
"asar": "^2.0.1",
"electron-builder": "^22.3.2",
"electron-builder-squirrel-windows": "^22.3.2",
"electron-devtools-installer": "^2.2.4",
"electron-notarize": "^0.2.0",
"eslint": "^5.8.0",
"eslint-config-google": "^0.7.1",
"eslint-plugin-babel": "^4.1.2",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"matrix-js-sdk": "6.1.0",
"mkdirp": "^1.0.3",
"needle": "^2.3.2",
"node-pre-gyp": "^0.14.0",
"npm": "^6.13.7",
"rimraf": "^3.0.2",
"semver": "^7.1.3",
"tar": "^6.0.1"
},
"hakDependencies": {
"matrix-seshat": "^1.3.3"
},
"build": {
"appId": "im.riot.app",
"electronVersion": "8.0.3",
"files": [
"package.json",
{
"from": ".hak/hakModules",
"to": "node_modules"
},
"src/**"
],
"extraResources": [
{
"from": "res/img",
"to": "img"
},
"webapp.asar"
],
"linux": {
"target": "deb",
"category": "Network;InstantMessaging;Chat",
"maintainer": "support@riot.im",
"desktop": {
"StartupWMClass": "riot"
}
},
"mac": {
"category": "public.app-category.social-networking",
"darkModeSupport": true
},
"win": {
"target": {
"target": "squirrel"
},
"sign": "scripts/electron_winSign"
},
"directories": {
"output": "dist"
},
"afterSign": "scripts/electron_afterSign",
"protocols": [
{
"name": "riot",
"schemes": [
"riot"
]
}
]
}
}
Loading