pyrox.dev
Merge pull request #146325 from ryantm/dev/ryantm/discourse-update-py
discourse/update.py: fix for nix 2.4/2.5pre
authored by Kim Lindberger and committed by GitHub 7dfea718 d2d03f07
+1
-1
pkgs/servers/web-apps/discourse/update.py
+1
-1
pkgs/servers/web-apps/discourse/update.py
···
79
def _nix_eval(expr: str):
80
nixpkgs_path = Path(__file__).parent / '../../../../'
81
try:
82
-
output = subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)
83
except subprocess.CalledProcessError:
84
return None
85
return json.loads(output)
···
79
def _nix_eval(expr: str):
80
nixpkgs_path = Path(__file__).parent / '../../../../'
81
try:
82
+
output = subprocess.check_output(['nix-instantiate', '--strict', '--json', '--eval', '-E', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)
83
except subprocess.CalledProcessError:
84
return None
85
return json.loads(output)
+2
-2
pkgs/tools/package-management/nix-universal-prefetch/default.nix
+2
-2
pkgs/tools/package-management/nix-universal-prefetch/default.nix
···
6
# No gems used, so mkDerivation is fine.
7
stdenv.mkDerivation rec {
8
pname = "nix-universal-prefetch";
9
-
version = "0.3.0";
10
11
src = fetchFromGitHub {
12
owner = "samueldr";
13
repo = "nix-universal-prefetch";
14
rev = "v${version}";
15
-
sha256 = "1nmxp6846ip2x3mibys3ymgi0813g18p9szqnsciiib3dbis4kwf";
16
};
17
18
installPhase = ''
···
6
# No gems used, so mkDerivation is fine.
7
stdenv.mkDerivation rec {
8
pname = "nix-universal-prefetch";
9
+
version = "0.4.0";
10
11
src = fetchFromGitHub {
12
owner = "samueldr";
13
repo = "nix-universal-prefetch";
14
rev = "v${version}";
15
+
sha256 = "sha256-HGn4qHWqpUwlS3yQrD3j5oH0yOlphsoSPD2vkyyRv+0=";
16
};
17
18
installPhase = ''