pyrox.dev
Merge staging-next into staging
authored by
github-actions[bot]
and committed by
GitHub
2e78c8c7
7e0ff70a
+55
-5
nixos/modules/services/network-filesystems/rsyncd.nix
+55
-5
nixos/modules/services/network-filesystems/rsyncd.nix
···
46
'';
47
};
48
49
};
50
};
51
···
63
64
services.rsyncd.settings.global.port = toString cfg.port;
65
66
-
systemd.services.rsyncd = {
67
-
description = "Rsync daemon";
68
-
wantedBy = [ "multi-user.target" ];
69
-
serviceConfig.ExecStart =
70
-
"${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}";
71
};
72
};
73
74
meta.maintainers = with lib.maintainers; [ ehmry ];
···
46
'';
47
};
48
49
+
socketActivated = mkOption {
50
+
default = false;
51
+
type = types.bool;
52
+
description =
53
+
"If enabled Rsync will be socket-activated rather than run persistently.";
54
+
};
55
+
56
};
57
};
58
···
70
71
services.rsyncd.settings.global.port = toString cfg.port;
72
73
+
systemd = let
74
+
serviceConfigSecurity = {
75
+
ProtectSystem = "full";
76
+
PrivateDevices = "on";
77
+
NoNewPrivileges = "on";
78
+
};
79
+
in {
80
+
services.rsync = {
81
+
enable = !cfg.socketActivated;
82
+
aliases = [ "rsyncd" ];
83
+
84
+
description = "fast remote file copy program daemon";
85
+
after = [ "network.target" ];
86
+
documentation = [ "man:rsync(1)" "man:rsyncd.conf(5)" ];
87
+
88
+
serviceConfig = serviceConfigSecurity // {
89
+
ExecStart =
90
+
"${pkgs.rsync}/bin/rsync --daemon --no-detach --config=${configFile}";
91
+
RestartSec = 1;
92
+
};
93
+
94
+
wantedBy = [ "multi-user.target" ];
95
+
};
96
+
97
+
services."rsync@" = {
98
+
description = "fast remote file copy program daemon";
99
+
after = [ "network.target" ];
100
+
101
+
serviceConfig = serviceConfigSecurity // {
102
+
ExecStart = "${pkgs.rsync}/bin/rsync --daemon --config=${configFile}";
103
+
StandardInput = "socket";
104
+
StandardOutput = "inherit";
105
+
StandardError = "journal";
106
+
};
107
+
};
108
+
109
+
sockets.rsync = {
110
+
enable = cfg.socketActivated;
111
+
112
+
description = "socket for fast remote file copy program daemon";
113
+
conflicts = [ "rsync.service" ];
114
+
115
+
listenStreams = [ (toString cfg.port) ];
116
+
socketConfig.Accept = true;
117
+
118
+
wantedBy = [ "sockets.target" ];
119
+
};
120
};
121
+
122
};
123
124
meta.maintainers = with lib.maintainers; [ ehmry ];
+25
-14
nixos/tests/rsyncd.nix
+25
-14
nixos/tests/rsyncd.nix
···
2
name = "rsyncd";
3
meta.maintainers = with pkgs.lib.maintainers; [ ehmry ];
4
5
-
nodes.machine.services.rsyncd = {
6
-
enable = true;
7
-
settings = {
8
-
global = {
9
-
"reverse lookup" = false;
10
-
"forward lookup" = false;
11
};
12
-
tmp = {
13
-
path = "/nix/store";
14
-
comment = "test module";
15
-
};
16
-
17
-
};
18
};
19
20
testScript = ''
21
start_all()
22
-
machine.wait_for_unit("rsyncd")
23
-
machine.succeed("rsync localhost::")
24
'';
25
})
···
2
name = "rsyncd";
3
meta.maintainers = with pkgs.lib.maintainers; [ ehmry ];
4
5
+
nodes = let
6
+
mkNode = socketActivated:
7
+
{ config, ... }: {
8
+
networking.firewall.allowedTCPPorts = [ config.services.rsyncd.port ];
9
+
services.rsyncd = {
10
+
enable = true;
11
+
inherit socketActivated;
12
+
settings = {
13
+
global = {
14
+
"reverse lookup" = false;
15
+
"forward lookup" = false;
16
+
};
17
+
tmp = {
18
+
path = "/nix/store";
19
+
comment = "test module";
20
+
};
21
+
};
22
+
};
23
};
24
+
in {
25
+
a = mkNode false;
26
+
b = mkNode true;
27
};
28
29
testScript = ''
30
start_all()
31
+
a.wait_for_unit("rsync")
32
+
b.wait_for_unit("sockets.target")
33
+
b.succeed("rsync a::")
34
+
a.succeed("rsync b::")
35
'';
36
})
+43
pkgs/applications/audio/callaudiod/default.nix
+43
pkgs/applications/audio/callaudiod/default.nix
···
···
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitLab
4
+
, meson
5
+
, ninja
6
+
, pkg-config
7
+
, glib
8
+
, alsaLib
9
+
, libpulseaudio
10
+
}:
11
+
12
+
stdenv.mkDerivation rec {
13
+
pname = "callaudiod";
14
+
version = "0.0.4";
15
+
16
+
src = fetchFromGitLab {
17
+
domain = "gitlab.com";
18
+
owner = "mobian1";
19
+
repo = pname;
20
+
rev = version;
21
+
sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj";
22
+
};
23
+
24
+
nativeBuildInputs = [
25
+
meson
26
+
ninja
27
+
pkg-config
28
+
];
29
+
30
+
buildInputs = [
31
+
alsaLib
32
+
libpulseaudio
33
+
glib
34
+
];
35
+
36
+
meta = with lib; {
37
+
description = "Daemon for dealing with audio routing during phone calls";
38
+
homepage = "https://gitlab.com/mobian1/callaudiod";
39
+
license = licenses.gpl3Plus;
40
+
maintainers = with maintainers; [ pacman99 ];
41
+
platforms = platforms.linux;
42
+
};
43
+
}
+52
pkgs/applications/misc/feedbackd/default.nix
+52
pkgs/applications/misc/feedbackd/default.nix
···
···
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitLab
4
+
, meson
5
+
, ninja
6
+
, pkg-config
7
+
, wrapGAppsHook
8
+
, glib
9
+
, gsound
10
+
, libgudev
11
+
, json-glib
12
+
, vala
13
+
, gobject-introspection
14
+
}:
15
+
16
+
stdenv.mkDerivation rec {
17
+
pname = "feedbackd-unstable";
18
+
version = "2021-01-25";
19
+
20
+
src = fetchFromGitLab {
21
+
domain = "source.puri.sm";
22
+
owner = "Librem5";
23
+
repo = "feedbackd";
24
+
rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}";
25
+
sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v";
26
+
};
27
+
28
+
nativeBuildInputs = [
29
+
meson
30
+
ninja
31
+
pkg-config
32
+
wrapGAppsHook
33
+
vala
34
+
gobject-introspection
35
+
];
36
+
37
+
buildInputs = [
38
+
glib
39
+
gsound
40
+
libgudev
41
+
json-glib
42
+
];
43
+
44
+
meta = with lib; {
45
+
description = "A daemon to provide haptic (and later more) feedback on events";
46
+
homepage = "https://source.puri.sm/Librem5/feedbackd";
47
+
license = licenses.gpl3Plus;
48
+
maintainers = with maintainers; [ pacman99 ];
49
+
platforms = platforms.linux;
50
+
};
51
+
}
52
+
+1
-1
pkgs/applications/misc/pdfpc/default.nix
+1
-1
pkgs/applications/misc/pdfpc/default.nix
+13
-6
pkgs/applications/networking/calls/default.nix
+13
-6
pkgs/applications/networking/calls/default.nix
···
1
-
{ lib, stdenv
2
, fetchFromGitLab
3
, meson
4
, ninja
5
, pkg-config
6
-
, libhandy_0
7
, modemmanager
8
, gtk3
9
, gom
10
, gsound
11
, evolution-data-server
12
, folks
13
, desktop-file-utils
···
22
23
stdenv.mkDerivation rec {
24
pname = "calls";
25
-
version = "0.1.5";
26
27
src = fetchFromGitLab {
28
domain = "source.puri.sm";
29
owner = "Librem5";
30
-
repo = "calls";
31
rev = "v${version}";
32
-
sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18";
33
};
34
35
nativeBuildInputs = [
···
38
pkg-config
39
desktop-file-utils
40
vala
41
wrapGAppsHook
42
];
43
44
buildInputs = [
45
modemmanager
46
-
libhandy_0
47
evolution-data-server
48
folks
49
gom
50
gsound
51
gtk3
52
libpeas
53
];
···
1
+
{ lib
2
+
, stdenv
3
, fetchFromGitLab
4
, meson
5
, ninja
6
+
, cmake
7
, pkg-config
8
+
, libhandy
9
, modemmanager
10
, gtk3
11
, gom
12
, gsound
13
+
, feedbackd
14
+
, callaudiod
15
, evolution-data-server
16
, folks
17
, desktop-file-utils
···
26
27
stdenv.mkDerivation rec {
28
pname = "calls";
29
+
version = "0.2.0";
30
31
src = fetchFromGitLab {
32
domain = "source.puri.sm";
33
owner = "Librem5";
34
+
repo = pname;
35
rev = "v${version}";
36
+
sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l";
37
};
38
39
nativeBuildInputs = [
···
42
pkg-config
43
desktop-file-utils
44
vala
45
+
cmake
46
wrapGAppsHook
47
];
48
49
buildInputs = [
50
modemmanager
51
+
libhandy
52
evolution-data-server
53
folks
54
gom
55
gsound
56
+
feedbackd
57
+
callaudiod
58
gtk3
59
libpeas
60
];
+44
pkgs/applications/video/obs-studio/obs-gstreamer.nix
+44
pkgs/applications/video/obs-studio/obs-gstreamer.nix
···
···
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, gst_all_1
5
+
, pkg-config
6
+
, meson
7
+
, ninja
8
+
, obs-studio
9
+
}:
10
+
11
+
stdenv.mkDerivation rec {
12
+
pname = "obs-gstreamer";
13
+
version = "0.2.1";
14
+
15
+
src = fetchFromGitHub {
16
+
owner = "fzwoch";
17
+
repo = "obs-gstreamer";
18
+
rev = "v${version}";
19
+
sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid";
20
+
};
21
+
22
+
nativeBuildInputs = [ pkg-config meson ninja ];
23
+
buildInputs = [ gst_all_1.gstreamermm obs-studio ];
24
+
25
+
# obs-studio expects the shared object to be located in bin/32bit or bin/64bit
26
+
# https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48
27
+
postInstall = let
28
+
pluginPath = {
29
+
i686-linux = "bin/32bit";
30
+
x86_64-linux = "bin/64bit";
31
+
}.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}");
32
+
in ''
33
+
mkdir -p $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath}
34
+
ln -s $out/lib/obs-plugins/obs-gstreamer.so $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath}
35
+
'';
36
+
37
+
meta = with lib; {
38
+
description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio";
39
+
homepage = "https://github.com/fswoch/obs-gstreamer";
40
+
maintainers = with maintainers; [ ahuzik ];
41
+
license = licenses.gpl2Plus;
42
+
platforms = [ "x86_64-linux" "i686-linux" ];
43
+
};
44
+
}
+12
-28
pkgs/development/compilers/flutter/default.nix
+12
-28
pkgs/development/compilers/flutter/default.nix
···
1
-
{ callPackage, dart }:
2
let
3
-
dart_stable = dart.override { version = "2.10.0"; };
4
-
dart_beta = dart.override { version = "2.10.0"; };
5
-
dart_dev = dart.override { version = "2.11.0-161.0.dev"; };
6
mkFlutter = opts: callPackage (import ./flutter.nix opts) { };
7
getPatches = dir:
8
let files = builtins.attrNames (builtins.readDir dir);
9
in map (f: dir + ("/" + f)) files;
10
in
11
{
12
mkFlutter = mkFlutter;
13
stable = mkFlutter rec {
14
-
pname = "flutter";
15
-
channel = "stable";
16
-
version = "1.22.0";
17
-
filename = "flutter_linux_${version}-${channel}.tar.xz";
18
-
sha256Hash = "0ryrx458ss8ryhmspcfrhjvad2pl46bxh1qk5vzwzhxiqdc79vm8";
19
-
patches = getPatches ./patches/stable;
20
-
dart = dart_stable;
21
-
};
22
-
beta = mkFlutter rec {
23
-
pname = "flutter";
24
-
channel = "beta";
25
-
version = "1.22.0-12.3.pre";
26
-
filename = "flutter_linux_${version}-${channel}.tar.xz";
27
-
sha256Hash = "1axzz137z4lgpa09h7bjf52i6dij6a9wmjbha1182db23r09plzh";
28
-
patches = getPatches ./patches/stable;
29
-
dart = dart_beta;
30
-
};
31
-
dev = mkFlutter rec {
32
pname = "flutter";
33
-
channel = "dev";
34
-
version = "1.23.0-7.0.pre";
35
-
filename = "flutter_linux_${version}-${channel}.tar.xz";
36
-
sha256Hash = "166qb4qbv051bc71yj7c0vrkamhvzz3fp3mz318qzm947mydwjj5";
37
-
patches = getPatches ./patches/dev;
38
-
dart = dart_dev;
39
};
40
}
···
1
+
{ callPackage, fetchurl, dart }:
2
+
3
let
4
mkFlutter = opts: callPackage (import ./flutter.nix opts) { };
5
getPatches = dir:
6
let files = builtins.attrNames (builtins.readDir dir);
7
in map (f: dir + ("/" + f)) files;
8
+
version = "1.22.5";
9
+
channel = "stable";
10
+
filename = "flutter_linux_${version}-${channel}.tar.xz";
11
in
12
{
13
mkFlutter = mkFlutter;
14
stable = mkFlutter rec {
15
+
inherit dart version;
16
pname = "flutter";
17
+
patches = getPatches ./patches;
18
+
src = fetchurl {
19
+
url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";
20
+
sha256 = "1dv5kczcj9npf7xxlanmpc9ijnxa3ap46521cxn14c0i3y9295ja";
21
+
};
22
+
depsSha256 = "0d7vhk6axgqajy2d9ia9lc6awcnz6cc3n04r7hnh7bx4hb0jv0l1";
23
};
24
}
+26
-27
pkgs/development/compilers/flutter/flutter.nix
+26
-27
pkgs/development/compilers/flutter/flutter.nix
···
1
-
{ channel
2
-
, pname
3
, version
4
-
, sha256Hash
5
, patches
6
, dart
7
-
, filename ? "flutter_linux_${version}-${channel}.tar.xz"
8
}:
9
10
{ bash
···
13
, coreutils
14
, git
15
, runCommand
16
-
, lib, stdenv
17
, fetchurl
18
, alsaLib
19
, dbus
···
30
, nspr
31
, nss
32
, systemd
33
}:
34
let
35
-
drvName = "flutter-${channel}-${version}";
36
flutter = stdenv.mkDerivation {
37
name = "${drvName}-unwrapped";
38
39
-
src = fetchurl {
40
-
url =
41
-
"https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";
42
-
sha256 = sha256Hash;
43
-
};
44
45
-
buildInputs = [ git ];
46
-
47
-
inherit patches;
48
49
postPatch = ''
50
patchShebangs --build ./bin/
···
52
'';
53
54
buildPhase = ''
55
-
FLUTTER_ROOT=$(pwd)
56
-
FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
57
-
SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
58
-
STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
59
-
SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
60
-
DART_SDK_PATH="${dart}"
61
62
-
HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
63
-
# path is relative otherwise it's replaced by /build/flutter
64
65
-
(cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline)
66
67
local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
68
${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
69
echo "$revision" > "$STAMP_PATH"
70
echo -n "${version}" > version
71
-
72
-
rm -rf bin/cache/{artifacts,dart-sdk,downloads}
73
-
rm -f bin/cache/*.stamp
74
'';
75
76
installPhase = ''
···
146
homepage = "https://flutter.dev";
147
license = licenses.bsd3;
148
platforms = [ "x86_64-linux" ];
149
-
maintainers = with maintainers; [ babariviere ericdallo ];
150
};
151
} ''
152
mkdir -p $out/bin
···
1
+
{ pname
2
, version
3
, patches
4
, dart
5
+
, src
6
+
, depsSha256
7
}:
8
9
{ bash
···
12
, coreutils
13
, git
14
, runCommand
15
+
, stdenv
16
+
, lib
17
, fetchurl
18
, alsaLib
19
, dbus
···
30
, nspr
31
, nss
32
, systemd
33
+
, callPackage
34
}:
35
let
36
+
repository = callPackage ./repository.nix {
37
+
inherit src pname version dart depsSha256;
38
+
};
39
+
drvName = "flutter-${version}";
40
+
41
flutter = stdenv.mkDerivation {
42
name = "${drvName}-unwrapped";
43
44
+
buildInputs = [ git repository ];
45
46
+
inherit src patches;
47
48
postPatch = ''
49
patchShebangs --build ./bin/
···
51
'';
52
53
buildPhase = ''
54
+
export FLUTTER_ROOT="$(pwd)"
55
+
export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
56
+
export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
57
+
58
+
mkdir -p "$out/bin/cache"
59
+
export SNAPSHOT_PATH="$out/bin/cache/flutter_tools.snapshot"
60
+
export STAMP_PATH="$out/bin/cache/flutter_tools.stamp"
61
62
+
export DART_SDK_PATH="${dart}"
63
+
export PUB_CACHE="${repository}"
64
65
+
pushd "$FLUTTER_TOOLS_DIR"
66
+
${dart}/bin/pub get --offline
67
+
popd
68
69
local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
70
${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
71
echo "$revision" > "$STAMP_PATH"
72
echo -n "${version}" > version
73
'';
74
75
installPhase = ''
···
145
homepage = "https://flutter.dev";
146
license = licenses.bsd3;
147
platforms = [ "x86_64-linux" ];
148
+
maintainers = with maintainers; [ babariviere ericdallo thiagokokada ];
149
};
150
} ''
151
mkdir -p $out/bin
-31
pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
-31
pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
···
1
-
diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
2
-
index 22efe87443..c6954575c5 100644
3
-
--- a/bin/internal/shared.sh
4
-
+++ b/bin/internal/shared.sh
5
-
@@ -212,8 +212,6 @@ function shared::execute() {
6
-
# FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
7
-
# FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
8
-
9
-
- upgrade_flutter 7< "$PROG_NAME"
10
-
-
11
-
BIN_NAME="$(basename "$PROG_NAME")"
12
-
case "$BIN_NAME" in
13
-
flutter*)
14
-
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
15
-
index fb1616ba96..b973b3fd58 100644
16
-
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
17
-
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
18
-
@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
19
-
globals.flutterUsage.suppressAnalytics = true;
20
-
}
21
-
22
-
- try {
23
-
- await globals.flutterVersion.ensureVersionFile();
24
-
- } on FileSystemException catch (e) {
25
-
- globals.printError('Failed to write the version file to the artifact cache: "$e".');
26
-
- globals.printError('Please ensure you have permissions in the artifact cache directory.');
27
-
- throwToolExit('Failed to write the version file');
28
-
- }
29
-
final bool machineFlag = topLevelResults['machine'] as bool;
30
-
if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
31
-
await globals.flutterVersion.checkFlutterVersionFreshness();
···
-64
pkgs/development/compilers/flutter/patches/dev/move-cache.patch
-64
pkgs/development/compilers/flutter/patches/dev/move-cache.patch
···
1
-
diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
2
-
index a059a8e992..b664a7070c 100644
3
-
--- a/dev/devicelab/lib/framework/runner.dart
4
-
+++ b/dev/devicelab/lib/framework/runner.dart
5
-
@@ -137,7 +137,7 @@ Future<void> cleanupSystem() async {
6
-
print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
7
-
final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
8
-
final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
9
-
- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
10
-
+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
11
-
copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
12
-
if (!Platform.isWindows) {
13
-
await exec(
14
-
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
15
-
index 36714c5fb4..c0cc049ee1 100644
16
-
--- a/packages/flutter_tools/lib/src/asset.dart
17
-
+++ b/packages/flutter_tools/lib/src/asset.dart
18
-
@@ -6,6 +6,7 @@ import 'package:meta/meta.dart';
19
-
import 'package:package_config/package_config.dart';
20
-
import 'package:yaml/yaml.dart';
21
-
22
-
+import 'base/common.dart';
23
-
import 'base/context.dart';
24
-
import 'base/file_system.dart';
25
-
import 'base/utils.dart';
26
-
@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
27
-
for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
28
-
final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
29
-
result.add(_Asset(
30
-
- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
31
-
+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
32
-
relativeUri: Uri(path: entryUri.pathSegments.last),
33
-
entryUri: entryUri,
34
-
package: null,
35
-
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
36
-
index aaca036d78..43ff428f8d 100644
37
-
--- a/packages/flutter_tools/lib/src/cache.dart
38
-
+++ b/packages/flutter_tools/lib/src/cache.dart
39
-
@@ -226,8 +226,15 @@ class Cache {
40
-
return;
41
-
}
42
-
assert(_lock == null);
43
-
+
44
-
+ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
45
-
+ if (!dir.existsSync()) {
46
-
+ dir.createSync(recursive: true);
47
-
+ globals.os.chmod(dir, '755');
48
-
+ }
49
-
+
50
-
final File lockFile =
51
-
- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
52
-
+ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile'));
53
-
try {
54
-
_lock = lockFile.openSync(mode: FileMode.write);
55
-
} on FileSystemException catch (e) {
56
-
@@ -330,7 +337,7 @@ class Cache {
57
-
if (_rootOverride != null) {
58
-
return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
59
-
} else {
60
-
- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache'));
61
-
+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
62
-
}
63
-
}
64
-
···
pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
pkgs/development/compilers/flutter/patches/disable-auto-update.patch
pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
pkgs/development/compilers/flutter/patches/disable-auto-update.patch
pkgs/development/compilers/flutter/patches/stable/move-cache.patch
pkgs/development/compilers/flutter/patches/move-cache.patch
pkgs/development/compilers/flutter/patches/stable/move-cache.patch
pkgs/development/compilers/flutter/patches/move-cache.patch
+24
pkgs/development/compilers/flutter/repository.nix
+24
pkgs/development/compilers/flutter/repository.nix
···
···
1
+
{ lib, stdenv, dart, fetchurl, src, pname, version, depsSha256 }:
2
+
3
+
stdenv.mkDerivation {
4
+
inherit src version;
5
+
6
+
pname = "${pname}-deps";
7
+
buildInputs = [ dart ];
8
+
9
+
buildPhase = ''
10
+
export PUB_CACHE="$out"
11
+
export FLUTTER_ROOT="$(pwd)"
12
+
export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
13
+
14
+
pushd "$FLUTTER_TOOLS_DIR"
15
+
${dart}/bin/pub get
16
+
'';
17
+
18
+
dontInstall = true;
19
+
dontFixup = true;
20
+
21
+
outputHashAlgo = "sha256";
22
+
outputHashMode = "recursive";
23
+
outputHash = depsSha256;
24
+
}
+8
-2
pkgs/development/coq-modules/corn/default.nix
+8
-2
pkgs/development/coq-modules/corn/default.nix
···
3
with lib; mkCoqDerivation rec {
4
pname = "corn";
5
inherit version;
6
-
defaultVersion = if versions.range "8.6" "8.9" coq.coq-version then "8.8.1" else null;
7
-
release."8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
8
9
preConfigure = "patchShebangs ./configure.sh";
10
configureScript = "./configure.sh";
···
3
with lib; mkCoqDerivation rec {
4
pname = "corn";
5
inherit version;
6
+
defaultVersion = switch coq.coq-version [
7
+
{ case = "8.6"; out = "8.8.1"; }
8
+
{ case = (versions.range "8.7" "8.12"); out = "8.12.0"; }
9
+
] null;
10
+
release = {
11
+
"8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
12
+
"8.12.0".sha256 = "0b92vhyzn1j6cs84z2182fn82hxxj0bqq7hk6cs4awwb3vc7dkhi";
13
+
};
14
15
preConfigure = "patchShebangs ./configure.sh";
16
configureScript = "./configure.sh";
+31
-78
pkgs/development/interpreters/dart/default.nix
+31
-78
pkgs/development/interpreters/dart/default.nix
···
1
-
{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }:
2
-
3
-
let
4
-
5
-
sources = let
6
-
7
base = "https://storage.googleapis.com/dart-archive/channels";
8
-
stable_version = "stable";
9
-
dev_version = "dev";
10
x86_64 = "x64";
11
i686 = "ia32";
12
aarch64 = "arm64";
13
-
14
-
in {
15
-
"1.24.3-x86_64-darwin" = fetchurl {
16
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
17
-
sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l";
18
};
19
-
"1.24.3-x86_64-linux" = fetchurl {
20
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
21
-
sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3";
22
};
23
-
"1.24.3-i686-linux" = fetchurl {
24
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
25
-
sha256 = "0a559mfpb0zfd49zdcpld95h2g1lmcjwwsqf69hd9rw6j67qyyyn";
26
};
27
-
"1.24.3-aarch64-linux" = fetchurl {
28
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
29
-
sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
30
};
31
-
"2.7.2-x86_64-darwin" = fetchurl {
32
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
33
-
sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj";
34
-
};
35
-
"2.7.2-x86_64-linux" = fetchurl {
36
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
37
-
sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v";
38
-
};
39
-
"2.7.2-i686-linux" = fetchurl {
40
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
41
-
sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m";
42
-
};
43
-
"2.7.2-aarch64-linux" = fetchurl {
44
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
45
-
sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p";
46
-
};
47
-
"2.10.0-x86_64-darwin" = fetchurl {
48
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
49
-
sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j";
50
-
};
51
-
"2.10.0-x86_64-linux" = fetchurl {
52
-
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
53
-
sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb";
54
-
};
55
-
"2.9.0-4.0.dev-x86_64-darwin" = fetchurl {
56
-
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
57
-
sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s";
58
-
};
59
-
"2.9.0-4.0.dev-x86_64-linux" = fetchurl {
60
-
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
61
-
sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r";
62
-
};
63
-
"2.9.0-4.0.dev-i686-linux" = fetchurl {
64
-
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
65
-
sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc";
66
-
};
67
-
"2.9.0-4.0.dev-aarch64-linux" = fetchurl {
68
-
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
69
-
sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc";
70
-
};
71
-
"2.11.0-161.0.dev-x86_64-darwin" = fetchurl {
72
-
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
73
-
sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj";
74
-
};
75
-
"2.11.0-161.0.dev-x86_64-linux" = fetchurl {
76
-
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
77
-
sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i";
78
-
};
79
-
};
80
81
-
in
82
-
83
-
with lib;
84
85
stdenv.mkDerivation {
86
-
87
pname = "dart";
88
inherit version;
89
···
100
find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
101
'';
102
103
-
libPath = makeLibraryPath [ stdenv.cc.cc ];
104
105
dontStrip = true;
106
107
-
meta = {
108
homepage = "https://www.dartlang.org/";
109
-
maintainers = with maintainers; [ grburst ];
110
description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
111
longDescription = ''
112
Dart is a class-based, single inheritance, object-oriented language
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchurl
4
+
, unzip
5
+
, version ? "2.10.5"
6
+
, sources ?
7
+
let
8
base = "https://storage.googleapis.com/dart-archive/channels";
9
x86_64 = "x64";
10
i686 = "ia32";
11
aarch64 = "arm64";
12
+
# Make sure that if the user overrides version parameter they're
13
+
# also need to override sources, to avoid mistakes
14
+
version = "2.10.5";
15
+
in
16
+
{
17
+
"${version}-x86_64-darwin" = fetchurl {
18
+
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
19
+
sha256 = "1vb2m25w6v901id9syan9q69fa60sxxd7qpyzq21fn5dpah0g99i";
20
};
21
+
"${version}-x86_64-linux" = fetchurl {
22
+
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
23
+
sha256 = "1mb6m3vxjya1dz47mdna23c2015n3bz8dvz8fwggq6k3zp0a4dsh";
24
};
25
+
"${version}-i686-linux" = fetchurl {
26
+
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
27
+
sha256 = "10g4qrwvmabrdg4i8y0wq9g7whqcpkdfp05yilflg70ybplrscf7";
28
};
29
+
"${version}-aarch64-linux" = fetchurl {
30
+
url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
31
+
sha256 = "0js83wy496swcwia144fhxk872irb5nr6i8558hxabkdrpv1bky5";
32
};
33
+
}
34
+
}:
35
36
+
assert version != null && version != "";
37
+
assert sources != null && (builtins.isAttrs sources);
38
39
stdenv.mkDerivation {
40
pname = "dart";
41
inherit version;
42
···
53
find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
54
'';
55
56
+
libPath = lib.makeLibraryPath [ stdenv.cc.cc ];
57
58
dontStrip = true;
59
60
+
meta = with lib; {
61
homepage = "https://www.dartlang.org/";
62
+
maintainers = with maintainers; [ grburst thiagokokada ];
63
description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
64
longDescription = ''
65
Dart is a class-based, single inheritance, object-oriented language
+2
-2
pkgs/development/libraries/libcommuni/default.nix
+2
-2
pkgs/development/libraries/libcommuni/default.nix
···
4
5
stdenv.mkDerivation rec {
6
pname = "libcommuni";
7
-
version = "3.5.0";
8
9
src = fetchFromGitHub {
10
owner = "communi";
11
repo = "libcommuni";
12
rev = "v${version}";
13
-
sha256 = "15crqc7a4kwrfbxs121rpdysw0694hh7dr290gg7pm61akvnrqcm";
14
};
15
16
buildInputs = [ qtbase qtdeclarative ];
+7
pkgs/development/ocaml-modules/curly/default.nix
+7
pkgs/development/ocaml-modules/curly/default.nix
···
26
substituteInPlace src/curly.ml \
27
--replace "exe=\"curl\"" "exe=\"${curl}/bin/curl\""
28
'';
29
+
30
+
meta = with lib; {
31
+
description = "Curly is a brain dead wrapper around the curl command line utility";
32
+
homepage = "https://github.com/rgrinberg/curly";
33
+
license = licenses.isc;
34
+
maintainers = [ maintainers.sternenseemann ];
35
+
};
36
}
37
+2
-2
pkgs/development/python-modules/google-cloud-iam/default.nix
+2
-2
pkgs/development/python-modules/google-cloud-iam/default.nix
+35
pkgs/development/python-modules/pytest-order/default.nix
+35
pkgs/development/python-modules/pytest-order/default.nix
···
···
1
+
{ buildPythonPackage
2
+
, fetchPypi
3
+
, lib
4
+
, pytest
5
+
, pytest-xdist
6
+
, pytest-dependency
7
+
, pytest-mock
8
+
, pytestCheckHook
9
+
}:
10
+
11
+
buildPythonPackage rec {
12
+
pname = "pytest-order";
13
+
version = "0.9.4";
14
+
15
+
src = fetchPypi {
16
+
inherit pname version;
17
+
sha256 = "0b7i8z6rywnkb3skyg8bnfqgkjrwvkn64b4q07wfl1q7x65ksd26";
18
+
};
19
+
20
+
propagatedBuildInputs = [ pytest ];
21
+
22
+
checkInputs = [
23
+
pytestCheckHook
24
+
pytest-xdist
25
+
pytest-dependency
26
+
pytest-mock
27
+
];
28
+
29
+
meta = {
30
+
description = "Pytest plugin that allows you to customize the order in which your tests are run";
31
+
homepage = "https://github.com/mrbean-bremen/pytest-order";
32
+
license = lib.licenses.mit;
33
+
maintainers = [ lib.maintainers.jacg ];
34
+
};
35
+
}
+3
-3
pkgs/development/tools/analysis/brakeman/default.nix
+3
-3
pkgs/development/tools/analysis/brakeman/default.nix
···
4
inherit ruby;
5
name = "${gemName}-${version}";
6
gemName = "brakeman";
7
-
version = "4.8.0";
8
-
source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg";
9
10
meta = with lib; {
11
description = "Static analysis security scanner for Ruby on Rails";
12
homepage = "https://brakemanscanner.org/";
13
-
changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}";
14
license = [ licenses.unfreeRedistributable ];
15
platforms = ruby.meta.platforms;
16
maintainers = [ maintainers.marsam ];
···
4
inherit ruby;
5
name = "${gemName}-${version}";
6
gemName = "brakeman";
7
+
version = "5.0.0";
8
+
source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91";
9
10
meta = with lib; {
11
description = "Static analysis security scanner for Ruby on Rails";
12
homepage = "https://brakemanscanner.org/";
13
+
changelog = "https://github.com/presidentbeef/brakeman/blob/v${version}/CHANGES.md";
14
license = [ licenses.unfreeRedistributable ];
15
platforms = ruby.meta.platforms;
16
maintainers = [ maintainers.marsam ];
+2
-2
pkgs/development/tools/heroku/default.nix
+2
-2
pkgs/development/tools/heroku/default.nix
···
2
3
stdenv.mkDerivation rec {
4
pname = "heroku";
5
-
version = "7.45.0";
6
7
src = fetchurl {
8
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
9
-
sha256 = "0yxwy7ldi4r7r03a9ay7ikawfwa11x7lvldjskm7nl4a1g4i3jqi";
10
};
11
12
nativeBuildInputs = [ makeWrapper ];
···
2
3
stdenv.mkDerivation rec {
4
pname = "heroku";
5
+
version = "7.47.11";
6
7
src = fetchurl {
8
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
9
+
sha256 = "1inf2radpkd9jndap91cw0wbb2qmi71i287vyydl492372cf3cs2";
10
};
11
12
nativeBuildInputs = [ makeWrapper ];
+2
-1
pkgs/games/trackballs/default.nix
+2
-1
pkgs/games/trackballs/default.nix
+4
-4
pkgs/os-specific/linux/nvidia-x11/default.nix
+4
-4
pkgs/os-specific/linux/nvidia-x11/default.nix
···
22
# Policy: use the highest stable version as the default (on our master).
23
stable = if stdenv.hostPlatform.system == "x86_64-linux"
24
then generic {
25
-
version = "460.32.03";
26
-
sha256_64bit = "0qb0f8djys55b7qgvpbwafw5lkwvmcslqz3i2kr3jm354gy248ag";
27
-
settingsSha256 = "0mfkw0s4gy1dx671cp1kbpkpkf9c4271w5dz0ykiacz22simi83l";
28
-
persistencedSha256 = "1zrnmwlwqg3pgy1jvldy9iv994wr823rl7vjr1kqnngdmn7bflxl";
29
}
30
else legacy_390;
31
···
22
# Policy: use the highest stable version as the default (on our master).
23
stable = if stdenv.hostPlatform.system == "x86_64-linux"
24
then generic {
25
+
version = "460.39";
26
+
sha256_64bit = "0zx3v4xas9z18yv1z3irp626h8kvcg8aw344sqpacfh1g106dw0b";
27
+
settingsSha256 = "15fa6lmfmgg02gya47ynx5d7cqsb73w4rbg4ly7lc1pnwl5f9qhm";
28
+
persistencedSha256 = "1dj3w03fa1i32c9c7w9392bg3nr2dk8mm4qm0wv12cv587zml0gx";
29
}
30
else legacy_390;
31
+13
-16
pkgs/tools/admin/nomachine-client/default.nix
+13
-16
pkgs/tools/admin/nomachine-client/default.nix
···
1
{ lib, stdenv, file, fetchurl, makeWrapper,
2
autoPatchelfHook, jsoncpp, libpulseaudio }:
3
let
4
-
versionMajor = "6.12";
5
-
versionMinor = "3";
6
-
versionBuild_x86_64 = "7";
7
-
versionBuild_i686 = "8";
8
in
9
stdenv.mkDerivation rec {
10
pname = "nomachine-client";
···
13
src =
14
if stdenv.hostPlatform.system == "x86_64-linux" then
15
fetchurl {
16
-
urls = [
17
-
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
18
-
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"
19
-
];
20
-
sha256 = "1dqsqwxbd77g6gc0hvjmmg4flm3vwwv5y98m8d9wxyybp37vkmgd";
21
}
22
else if stdenv.hostPlatform.system == "i686-linux" then
23
fetchurl {
24
-
urls = [
25
-
"https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
26
-
"https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"
27
-
];
28
-
sha256 = "1q14hxjy66s5cpq19rshscsm679csb6p16c5p2agh5zd64cr4am6";
29
}
30
else
31
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
32
33
postUnpack = ''
34
mv $(find . -type f -name nxclient.tar.gz) .
35
mv $(find . -type f -name nxplayer.tar.gz) .
···
37
tar xf nxclient.tar.gz
38
tar xf nxplayer.tar.gz
39
rm $(find . -maxdepth 1 -type f)
40
'';
41
42
nativeBuildInputs = [ file makeWrapper autoPatchelfHook ];
···
85
description = "NoMachine remote desktop client (nxplayer)";
86
homepage = "https://www.nomachine.com/";
87
license = {
88
-
fullName = "NoMachine 6 End-User License Agreement";
89
-
url = "https://www.nomachine.com/licensing-6";
90
free = false;
91
};
92
maintainers = with maintainers; [ talyz ];
···
1
{ lib, stdenv, file, fetchurl, makeWrapper,
2
autoPatchelfHook, jsoncpp, libpulseaudio }:
3
let
4
+
versionMajor = "7.0";
5
+
versionMinor = "211";
6
+
versionBuild_x86_64 = "4";
7
+
versionBuild_i686 = "4";
8
in
9
stdenv.mkDerivation rec {
10
pname = "nomachine-client";
···
13
src =
14
if stdenv.hostPlatform.system == "x86_64-linux" then
15
fetchurl {
16
+
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
17
+
sha256 = "06habqsl5gp13sym519r3qp188qwqqfw8p48wcs4zj3kcri6fjz0";
18
}
19
else if stdenv.hostPlatform.system == "i686-linux" then
20
fetchurl {
21
+
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
22
+
sha256 = "1y4lr95mwilwr7gqsxqvygq4w3dcp4cjh8m06wdi3avwdzrjkgj9";
23
}
24
else
25
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
26
27
+
# nxusb-legacy is only needed for kernel versions < 3
28
postUnpack = ''
29
mv $(find . -type f -name nxclient.tar.gz) .
30
mv $(find . -type f -name nxplayer.tar.gz) .
···
32
tar xf nxclient.tar.gz
33
tar xf nxplayer.tar.gz
34
rm $(find . -maxdepth 1 -type f)
35
+
rm -r NX/share/src/nxusb-legacy
36
+
rm NX/bin/nxusbd-legacy NX/lib/libnxusb-legacy.so
37
'';
38
39
nativeBuildInputs = [ file makeWrapper autoPatchelfHook ];
···
82
description = "NoMachine remote desktop client (nxplayer)";
83
homepage = "https://www.nomachine.com/";
84
license = {
85
+
fullName = "NoMachine 7 End-User License Agreement";
86
+
url = "https://www.nomachine.com/licensing-7";
87
free = false;
88
};
89
maintainers = with maintainers; [ talyz ];
+2
-2
pkgs/tools/misc/arp-scan/default.nix
+2
-2
pkgs/tools/misc/arp-scan/default.nix
+5
pkgs/top-level/aliases.nix
+5
pkgs/top-level/aliases.nix
···
117
cv = progress; # added 2015-09-06
118
d1x_rebirth = dxx-rebirth; # added 2018-04-25
119
d2x_rebirth = dxx-rebirth; # added 2018-04-25
120
dat = nodePackages.dat;
121
dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20
122
dbus_daemon = dbus.daemon; # added 2018-04-25
···
174
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
175
flameGraph = flamegraph; # added 2018-04-25
176
flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
177
flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
178
foldingathome = fahclient; # added 2020-09-03
179
font-awesome-ttf = font-awesome; # 2018-02-25
···
117
cv = progress; # added 2015-09-06
118
d1x_rebirth = dxx-rebirth; # added 2018-04-25
119
d2x_rebirth = dxx-rebirth; # added 2018-04-25
120
+
dart_dev = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15
121
+
dart_old = throw "Non-stable versions of Dart have been removed."; # added 2020-01-15
122
+
dart_stable = dart; # added 2020-01-15
123
dat = nodePackages.dat;
124
dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # added 2020-09-20
125
dbus_daemon = dbus.daemon; # added 2018-04-25
···
177
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
178
flameGraph = flamegraph; # added 2018-04-25
179
flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # added 2021-01-25
180
+
flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
181
+
flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # added 2020-01-15
182
flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03
183
foldingathome = fahclient; # added 2020-09-03
184
font-awesome-ttf = font-awesome; # 2018-02-25
+6
-5
pkgs/top-level/all-packages.nix
+6
-5
pkgs/top-level/all-packages.nix
···
1111
1112
bunny = callPackage ../tools/package-management/bunny { };
1113
1114
calls = callPackage ../applications/networking/calls { };
1115
1116
inherit (nodePackages) castnow;
···
9597
flutterPackages =
9598
recurseIntoAttrs (callPackage ../development/compilers/flutter { });
9599
flutter = flutterPackages.stable;
9600
-
flutter-beta = flutterPackages.beta;
9601
-
flutter-dev = flutterPackages.dev;
9602
9603
fpc = callPackage ../development/compilers/fpc { };
9604
···
21789
};
21790
21791
fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
21792
21793
fehlstart = callPackage ../applications/misc/fehlstart { };
21794
···
23912
23913
obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
23914
23915
obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { };
23916
23917
obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
···
29490
spdlog = spdlog_1;
29491
29492
dart = callPackage ../development/interpreters/dart { };
29493
-
dart_old = dart.override { version = "1.24.3"; };
29494
-
dart_stable = dart.override { version = "2.7.2"; };
29495
-
dart_dev = dart.override { version = "2.9.0-4.0.dev"; };
29496
29497
httrack = callPackage ../tools/backup/httrack { };
29498
···
1111
1112
bunny = callPackage ../tools/package-management/bunny { };
1113
1114
+
callaudiod = callPackage ../applications/audio/callaudiod { };
1115
+
1116
calls = callPackage ../applications/networking/calls { };
1117
1118
inherit (nodePackages) castnow;
···
9599
flutterPackages =
9600
recurseIntoAttrs (callPackage ../development/compilers/flutter { });
9601
flutter = flutterPackages.stable;
9602
9603
fpc = callPackage ../development/compilers/fpc { };
9604
···
21789
};
21790
21791
fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
21792
+
21793
+
feedbackd = callPackage ../applications/misc/feedbackd { };
21794
21795
fehlstart = callPackage ../applications/misc/fehlstart { };
21796
···
23914
23915
obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };
23916
23917
+
obs-gstreamer = callPackage ../applications/video/obs-studio/obs-gstreamer.nix { };
23918
+
23919
obs-move-transition = callPackage ../applications/video/obs-studio/obs-move-transition.nix { };
23920
23921
obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { };
···
29494
spdlog = spdlog_1;
29495
29496
dart = callPackage ../development/interpreters/dart { };
29497
29498
httrack = callPackage ../tools/backup/httrack { };
29499
+2
pkgs/top-level/python-packages.nix
+2
pkgs/top-level/python-packages.nix
···
6087
6088
pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { };
6089
6090
+
pytest-order = callPackage ../development/python-modules/pytest-order { };
6091
+
6092
pytest-ordering = callPackage ../development/python-modules/pytest-ordering { };
6093
6094
pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { };