diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 93298af2e3e..b28e3cf0deb 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -746,6 +746,8 @@ in umask u=rwx,g=rx,o= + rm -rf /var/lib/discourse/tmp/* + cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/ ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads @@ -767,7 +769,7 @@ in ) discourse-rake db:migrate >>/var/log/discourse/db_migration.log - chmod -R u+w /run/discourse/tmp/ + chmod -R u+w /var/lib/discourse/tmp/ ${lib.optionalString (!cfg.admin.skipCreate) mkAdmin} @@ -782,7 +784,6 @@ in RuntimeDirectory = map (p: "discourse/" + p) [ "config" "home" - "tmp" "assets/javascripts/plugins" "public" "sockets" @@ -791,6 +792,7 @@ in StateDirectory = map (p: "discourse/" + p) [ "uploads" "backups" + "tmp" ]; StateDirectoryMode = 0750; LogsDirectory = "discourse"; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 5a00b83b023..45c0e693fca 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -74,7 +74,7 @@ let installPhase = '' runHook preInstall - '' + (if system == "x86_64-darwin" then '' + '' + (if stdenv.isDarwin then '' mkdir -p "$out/Applications/${longName}.app" $out/bin cp -r ./* "$out/Applications/${longName}.app" ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName} diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index dc980a00587..de3f2302cfe 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -7,16 +7,18 @@ let x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; aarch64-linux = "linux-arm64"; + aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; }.${system}; - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0cklp0mp7qylzrqnfbvzs308q0bzpswlqw5n98qhl1jb5783svx1"; - x86_64-darwin = "04yyv0wpkzdjfiy9kj2jslhv7nc5i6nw2207vfnbzysgs55l3x63"; - aarch64-linux = "1ygk51902g0q7x3r6kd3s7gi2gx86x10svpvbipl494qcyfngqzs"; - armv7l-linux = "0z5rg1nl8lz7zsvml6dfz093dbyrkr4zvvfssqiyarw4n24d2mim"; + x86_64-linux = "0ma8pysww4r3p73rf94wddxk2ar091yw8mk1gi9jawiqvb9ksx0m"; + x86_64-darwin = "008v7hxv71bvfp52wfx3sg97s54bn2klvy5xfjh48wcaka10vsj0"; + aarch64-linux = "1wi5bmjdjfy1la3lwb3c389cjbn4q12j1214vna9214d8if37dyv"; + aarch64-darwin = "14v0gq4kj0lxa6pwi7nbdpw0l25yfcqydigfzhmwrp8ipbnma62k"; + armv7l-linux = "0h94gzwxknlvfy9gcd0zq4qsjmr9zr22adbfrqm1gvv1aksmgm4b"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.57.1"; + version = "1.60.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -57,6 +59,6 @@ in downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 1b760c4c7a9..e63ca893e4c 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchzip , writeScript , alsaLib , autoconf213 @@ -52,15 +52,12 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.0.2"; + version = "29.4.1"; - src = fetchFromGitHub { - githubBase = "repo.palemoon.org"; - owner = "MoonchildProductions"; - repo = "Pale-Moon"; - rev = "${version}_Release"; - sha256 = "086f517xkk4smx57klyyvx4m3g6r5f1667w990zhpapbh997hfri"; - fetchSubmodules = true; + src = fetchzip { + url = "http://archive.palemoon.org/source/palemoon-${version}-source.tar.xz"; + stripRoot = false; + sha256 = "0kb9yn1q8rrmnlsyvxvv2gdgyyf12g6rxlyh82lmc0gysvd4qd2c"; }; passthru.updateScript = writeScript "update-${pname}" '' diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 07bab2c9aa2..ba1ebf0dc75 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -288,7 +288,7 @@ let cp -r . $out/share/discourse rm -r $out/share/discourse/log ln -sf /var/log/discourse $out/share/discourse/log - ln -sf /run/discourse/tmp $out/share/discourse/tmp + ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index a3a7a8bd54a..ce757401b36 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { - version = "2.30"; pname = "wgetpaste"; + version = "2.32"; src = fetchurl { - url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; - sha256 = "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73"; + url = "https://github.com/zlin/wgetpaste/releases/download/${version}/wgetpaste-${version}.tar.xz"; + sha256 = "04yv1hndxhrc5axwiw1yy0yrw1kli5fk4yj4267l7xdwqzxvl7b2"; }; # currently zsh-autocompletion support is not installed @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; - homepage = "http://wgetpaste.zlin.dk/"; + homepage = "https://github.com/zlin/wgetpaste"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ qknight domenkozar ]; platforms = lib.platforms.all;