diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/web-apps')
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/moodle/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/netbox/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/slskd/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/slskd/deps.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch | 13 |
7 files changed, 19 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix b/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix index 9c94ad3bd545..4e2070d91ebd 100644 --- a/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "16.0.5"; + version = "17.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-+OAkUMwLXZGFPQocJARIG//+0V1Dv5MdZvythbp4KPw="; + sha256 = "sha256-RpmeBoFY2TyYTpHLG2Kx5FezUHzwukj1+SfZhQOqxqU="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix b/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix index cd7b11102731..d578fde8e56b 100644 --- a/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix @@ -55,6 +55,13 @@ mkYarnPackage { hash = pinData.uiYarnDepsHash; }; + patchPhase = '' + substituteInPlace ./package.json \ + --replace '$(git rev-parse --short HEAD)' "${src.rev}" \ + --replace 'yarn clean' 'yarn --offline clean' \ + --replace 'yarn run rimraf dist' 'yarn --offline run rimraf dist' + ''; + yarnPreBuild = '' export npm_config_nodedir=${nodejs} ''; @@ -79,6 +86,7 @@ mkYarnPackage { passthru.updateScript = ./update.py; passthru.tests.lemmy-ui = nixosTests.lemmy; + passthru.commit_sha = src.rev; meta = with lib; { description = "Building a federated alternative to reddit in rust"; diff --git a/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index 5eb3d997a053..0ab0d0f7db29 100644 --- a/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.1.3"; + version = "4.1.4"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-JMK+nGgeBryC6I9cg1DD52gIGcPMAJ/xZxrC4a1R5Ps="; + url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; + hash = "sha256-mfJV5KHOG401N8gHFWYygsRRVnlWyn0SojD1H5KAvPQ="; }; phpConfig = writeText "config.php" '' diff --git a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index e5f99033b5d4..5ba7efc83eac 100644 --- a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -26,8 +26,8 @@ in }; netbox = callPackage generic { - version = "3.5.7"; - hash = "sha256-R5P4FOhn7rE6e9H9U3JlE3ms4Svv6ps4c3+ZjE1KwNM="; + version = "3.5.8"; + hash = "sha256-i8LwMZYItDG5wz0yVn59710R615i81/KYT58og1Ut6A="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch diff --git a/nixpkgs/pkgs/servers/web-apps/slskd/default.nix b/nixpkgs/pkgs/servers/web-apps/slskd/default.nix index a63c7eceb064..bff64dd3bb0a 100644 --- a/nixpkgs/pkgs/servers/web-apps/slskd/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/slskd/default.nix @@ -10,13 +10,13 @@ }: let pname = "slskd"; - version = "0.17.8"; + version = "0.18.2"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; rev = version; - sha256 = "sha256-kqkJZNxg044RbgHFsRfvRMyFRBjnIubdHRqUuMjj2D0="; + sha256 = "sha256-hWK6nbXAZTjxukx9EzkJkyEFlqXUkjanmv4VfHZxW24="; }; meta = with lib; { @@ -34,9 +34,8 @@ let pname = "slskd-web"; src = "${src}/src/web"; - patches = [ ./package-lock.patch ]; npmFlags = [ "--legacy-peer-deps" ]; - npmDepsHash = "sha256-vURi36ebdJQofhBlElIH5m6T1b8tsVGAzXCiDYUcSww="; + npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI="; installPhase = '' cp -r build $out ''; diff --git a/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix b/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix index b911a2cd3d94..d40a61d3d2d6 100644 --- a/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix +++ b/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix @@ -102,6 +102,7 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.255"; sha256 = "17m7nqiwfvpbmy0c9l1i71hh1n2vnjm7hdmb6ppgwmbq6ypnxy4a"; }) (fetchNuGet { pname = "prometheus-net"; version = "7.0.0"; sha256 = "13h42444mx4nbafhn0aw7xg8gg5dxjszv3qxfz1dflayzmcwganf"; }) (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "7.0.0"; sha256 = "0cjdh47qimcg6bmflnwl5xv77vxn4h4hmd1znv8b5a7krg1hrf5k"; }) (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "7.0.0"; sha256 = "0q9gal3hkd45d78s1p0f3dv0kxr0byq69k0aq6pmmh9h6rpx56dl"; }) diff --git a/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch b/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch deleted file mode 100644 index 59bc95c2aea0..000000000000 --- a/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 5a84fbe7..562051c7 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -12425,7 +12425,7 @@ - "node_modules/pkg-up/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "engines": { - "node": ">=4" |