NixOS · Sep 4, 2020 · Sep 4, 2020 · Sep 11, 2020 · Sep 13, 2020 · Sep 13, 2020
diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nwg-launchers";
-  version = "0.2.0";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1mlym0mpg6njwgwniwlk95fk6wfwlzq8nwmkb5mkjlm2nqv5bdv1";
+    sha256 = "1p1bwsn7l4vp7y183735pgsfbh7dssdfn0wjzacl4s87arjdcgvb";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix
@@ -1,19 +1,27 @@
-{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config, fetchpatch }:
 
 mkDerivation rec {
   pname = "openrgb";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "CalcProgrammer1";
     repo = "OpenRGB";
     rev = "release_${version}";
-    sha256 = "1931aisdahjr99d4qqk824ib4x19mvhqgqmkm3j6fc5zd2hnw87m";
+    sha256 = "sha256-tHrRG2Zx7NYqn+WPiRpAlWA/QmxuAYidENanTkC1XVw";
   };
 
   nativeBuildInputs = [ qmake pkg-config ];
   buildInputs = [ libusb1 hidapi ];
 
+  patches = [
+    # Make build SOURCE_DATE_EPOCH aware, merged in master
+    (fetchpatch {
+      url = "https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/f1b7b8ba900db58a1119d8d3e21c1c79de5666aa.patch";
+      sha256 = "17m1hn1kjxfcmd4p3zjhmr5ar9ng0zfbllq78qxrfcq1a0xrkybx";
+    })
+  ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp OpenRGB $out/bin

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -16,13 +16,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "palemoon";
-  version = "28.12.0";
+  version = "28.13.0";
 
   src = fetchFromGitHub {
     owner = "MoonchildProductions";
     repo = "Pale-Moon";
     rev = "${version}_Release";
-    sha256 = "1cc75972nhmxkkynkky1m2fijbf3qlzvpxsd98mxlx0b7h4d3l5l";
+    sha256 = "1lza6239kb32wnwd9cwddn11npg1qx7p69l7qy63h9c59w29iypa";
     fetchSubmodules = true;
   };
 
@@ -88,12 +88,16 @@ in stdenv.mkDerivation rec {
     ac_add_options --disable-debug
     ac_add_options --disable-necko-wifi
     ac_add_options --disable-updater
+
     ac_add_options --with-pthreads
 
     # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
     ac_add_options --enable-official-branding
     export MOZILLA_OFFICIAL=1
 
+    # For versions after 28.12.0
+    ac_add_options --enable-phoenix-extensions
+
     ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}
 
     export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION

diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
@@ -1,24 +1,29 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gitoxide";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "gitoxide";
     rev = "v${version}";
-    sha256 = "0xpic9jx7nrxi5d8lqch2vxpvipx994d717c4n0kgr3ipyij1347";
+    sha256 = "0sx3z9l9n9qq2zj91pgm7znhxjsj59zvwms3aivfglhawwj3iwyj";
   };
 
-  cargoSha256 = "104lyfni75h1i30s2jlzf66sp1czfd9ywqz78kj4i7lfdf6fc4x9";
+  cargoSha256 = "0ykkh86p4csi0v3pb2idjk94w9m32a34a5qrvna7ml5yz84m8hva";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  # Needed to get openssl-sys to use pkgconfig.
+  OPENSSL_NO_VENDOR = 1;
 
   meta = with lib; {
     description =
       "A command-line application for interacting with git repositories";
     homepage = "https://github.com/Byron/gitoxide";
-    # NOTE: the master branch is dual-licensed with APACHE but v0.3.0 is only MIT
-    license = licenses.mit;
+    license = with licenses; [ mit /* or */ asl20 ];
     maintainers = [ maintainers.syberant ];
   };
 }
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
+{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }:
 
 stdenv.mkDerivation rec {
   pname = "emojione";
@@ -11,6 +11,22 @@ stdenv.mkDerivation rec {
     sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3";
   };
 
+  patches = [
+    # Fix build with Inkscape 1.0
+    # https://github.com/eosrei/twemoji-color-font/pull/82
+    (fetchpatch {
+      url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch";
+      sha256 = "7tDWIkpcdir1V6skgXSM3r0FwHy0F6PyJ07OPRsSStA=";
+      postFetch = ''
+        substituteInPlace $out \
+          --replace "inkscape --without-gui" "inkscape --export-png" \
+          --replace TWEMOJI EMOJIONE \
+          --replace "the assets" "the emojione assets" \
+          --replace twemoji emojione
+      '';
+    })
+  ];
+
   preBuild = ''
     sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile
     # Shut up inkscape's warnings

diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
+{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }:
 
 stdenv.mkDerivation rec {
   pname = "twemoji-color-font";
@@ -10,6 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
   };
 
+  patches = [
+    # Fix build with Inkscape 1.0
+    # https://github.com/eosrei/twemoji-color-font/pull/82
+    (fetchpatch {
+      url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch";
+      sha256 = "TV8I++BEnVUQg7FNbnrEQ/MLV9n3drmspqjmDZgTGFI=";
+      postFetch = ''
+        substituteInPlace $out \
+          --replace "inkscape --without-gui" "inkscape --export-png"
+      '';
+    })
+  ];
+
   nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
   # silence inkscape errors about non-writable home
   preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
@@ -15,6 +15,7 @@ buildPythonPackage rec {
 
   preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR";
 
+  GRPC_BUILD_WITH_BORING_SSL_ASM = "";
   GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
   GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1;
   GRPC_PYTHON_BUILD_SYSTEM_CARES = 1;

diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
@@ -24,11 +24,6 @@ buildGoModule rec {
 
   doCheck = false;
 
-  postPatch = ''
-    substituteInPlace app.go \
-      --replace 'Version = "unknown"' 'Version = "${version}"'
-  '';
-
   buildInputs = [ sqlite ];
 
   ui = callPackage ./ui.nix { };
@@ -46,7 +41,7 @@ buildGoModule rec {
   subPackages = [ "." ];
 
   buildFlagsArray = [
-    "-ldflags='-X main.Version=${version} -X main.Mode=prod'"
+    "-ldflags=-X main.Version=${version} -X main.Mode=prod"
   ];
 
   meta = with stdenv.lib; {

diff --git a/pkgs/servers/gotify/package.json b/pkgs/servers/gotify/package.json
@@ -5,24 +5,24 @@
   "homepage": ".",
   "proxy": "http://localhost:80",
   "dependencies": {
-    "@material-ui/core": "^4.9.5",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
-    "axios": "^0.19.0",
-    "codemirror": "^5.43.0",
-    "detect-browser": "^5.1.0",
-    "js-base64": "^2.5.1",
-    "mobx": "^5.1.1",
-    "mobx-react": "^6.2.2",
-    "mobx-utils": "^5.0.2",
+    "axios": "^0.20.0",
+    "codemirror": "^5.57.0",
+    "detect-browser": "^5.1.1",
+    "js-base64": "^3.4.5",
+    "mobx": "^5.15.6",
+    "mobx-react": "^6.3.0",
+    "mobx-utils": "^5.6.1",
     "notifyjs": "^3.0.0",
     "prop-types": "^15.6.2",
     "react": "^16.4.2",
-    "react-codemirror2": "^7.1.0",
+    "react-codemirror2": "^7.2.1",
     "react-dom": "^16.4.2",
     "react-infinite": "^0.13.0",
     "react-markdown": "^4.0.6",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "react-timeago": "^4.1.9",
     "remove-markdown": "^0.3.0",
     "typeface-roboto": "0.0.75"
@@ -32,36 +32,41 @@
     "build": "react-scripts build",
     "test": "react-scripts test --env=node",
     "eject": "react-scripts eject",
-    "lint": "tslint --project .",
-    "lintfix": "tslint --fix --project .",
+    "lint": "eslint \"src/*.{ts,tsx}\"",
     "format": "prettier \"src/**/*.{ts,tsx}\" --write",
     "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different"
   },
   "devDependencies": {
-    "@types/codemirror": "0.0.91",
+    "@types/codemirror": "0.0.98",
     "@types/detect-browser": "^4.0.0",
     "@types/get-port": "^4.0.0",
-    "@types/jest": "^25.2.1",
-    "@types/js-base64": "^2.3.1",
-    "@types/node": "^13.13.5",
-    "@types/notifyjs": "^3.0.0",
-    "@types/puppeteer": "^2.0.1",
-    "@types/react": "^16.4.11",
-    "@types/react-dom": "^16.0.7",
-    "@types/react-infinite": "0.0.34",
+    "@types/jest": "^26.0.13",
+    "@types/js-base64": "^3.0.0",
+    "@types/node": "^14.10.1",
+    "@types/notifyjs": "^3.0.2",
+    "@types/puppeteer": "^3.0.2",
+    "@types/react": "^16.9.49",
+    "@types/react-dom": "^16.9.8",
+    "@types/react-infinite": "0.0.35",
     "@types/react-router-dom": "^5.1.5",
     "@types/remove-markdown": "^0.1.1",
     "@types/rimraf": "^3.0.0",
+    "@typescript-eslint/eslint-plugin": "^4.1.0",
+    "@typescript-eslint/parser": "^4.1.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jest": "^24.0.0",
+    "eslint-plugin-prefer-arrow": "^1.2.2",
+    "eslint-plugin-react": "^7.20.6",
+    "eslint-plugin-unicorn": "^21.0.0",
     "get-port": "^5.1.1",
-    "prettier": "^2.0.5",
-    "puppeteer": "^3.0.4",
-    "react-scripts": "^3.4.1",
+    "prettier": "^2.1.1",
+    "puppeteer": "^5.3.0",
+    "react-scripts": "^3.4.3",
     "rimraf": "^3.0.2",
     "tree-kill": "^1.2.0",
-    "tslint": "^6.1.2",
-    "tslint-sonarts": "^1.7.0",
-    "typescript": "3.8.3",
-    "wait-on": "^5.0.0"
+    "typescript": "4.0.2",
+    "wait-on": "^5.2.0"
   },
   "eslintConfig": {
     "extends": "react-app"

diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix
@@ -1 +1 @@
-"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb"
+"1v123j9d4psbg7pnqnc7bc9li2qyahapjbimmf0qpfxacx968gm9"
diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh
@@ -9,11 +9,11 @@ latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releas
 version=$(jq -r '.tag_name' <<<"$latest_release")
 echo got version $version
 echo \""${version#v}"\" > "$dirname/version.nix"
-printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix
+printf '%s\n' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix
 tput setaf 1
 echo zeroing vendorSha256 in $dirname/vendor-sha.nix
 tput sgr0
-printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix
+printf '"%s"\n' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix
 
 GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version"
 
@@ -32,7 +32,7 @@ echo running nix-build for gotify itself in order to get vendorSha256
 set +e
 vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)"
 set -e
-printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix
+printf '"%s"\n' "$vendorSha256" > $dirname/vendor-sha.nix
 tput setaf 2
 echo got vendorSha256 of: $vendorSha256
 tput sgr0

diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix
@@ -1 +1 @@
-"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng"
+"1in4gzmrgb6z7p5fnz33f88g5l0vki2xlxlllk5wy9icp4h3h9sd"
diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix
@@ -1 +1 @@
-"2.0.17"
+"2.0.18"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		"0agnbpqzz751643c4s0fs10b3zw98pp8r9kys9p1vxbb3d6r2anb"
		"1v123j9d4psbg7pnqnc7bc9li2qyahapjbimmf0qpfxacx968gm9"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		"0cczw8h1mibxmfgy2z6xnqq11x31ai17gnq2z4j5751b5finhqng"
		"1in4gzmrgb6z7p5fnz33f88g5l0vki2xlxlllk5wy9icp4h3h9sd"