pyrox.dev
lol
Merge master into staging-next
authored by
github-actions[bot]
and committed by
GitHub
71fe747e
250922fd
+1
lib/systems/default.nix
+1
lib/systems/default.nix
···
36
config = parse.tripleFromSystem final.parsed;
37
# Determine whether we can execute binaries built for the provided platform.
38
canExecute = platform:
39
parse.isCompatible final.parsed.cpu platform.parsed.cpu
40
&& final.parsed.kernel == platform.parsed.kernel;
41
isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
···
36
config = parse.tripleFromSystem final.parsed;
37
# Determine whether we can execute binaries built for the provided platform.
38
canExecute = platform:
39
+
final.isAndroid == platform.isAndroid &&
40
parse.isCompatible final.parsed.cpu platform.parsed.cpu
41
&& final.parsed.kernel == platform.parsed.kernel;
42
isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";
+5
-5
lib/systems/examples.nix
+5
-5
lib/systems/examples.nix
···
57
armv7a-android-prebuilt = {
58
config = "armv7a-unknown-linux-androideabi";
59
rustc.config = "armv7-linux-androideabi";
60
-
sdkVer = "29";
61
-
ndkVer = "21";
62
useAndroidPrebuilt = true;
63
} // platforms.armv7a-android;
64
65
aarch64-android-prebuilt = {
66
config = "aarch64-unknown-linux-android";
67
rustc.config = "aarch64-linux-android";
68
-
sdkVer = "29";
69
-
ndkVer = "21";
70
useAndroidPrebuilt = true;
71
};
72
73
aarch64-android = {
74
config = "aarch64-unknown-linux-android";
75
sdkVer = "30";
76
-
ndkVer = "21";
77
libc = "bionic";
78
useAndroidPrebuilt = false;
79
useLLVM = true;
···
57
armv7a-android-prebuilt = {
58
config = "armv7a-unknown-linux-androideabi";
59
rustc.config = "armv7-linux-androideabi";
60
+
sdkVer = "28";
61
+
ndkVer = "24";
62
useAndroidPrebuilt = true;
63
} // platforms.armv7a-android;
64
65
aarch64-android-prebuilt = {
66
config = "aarch64-unknown-linux-android";
67
rustc.config = "aarch64-linux-android";
68
+
sdkVer = "28";
69
+
ndkVer = "24";
70
useAndroidPrebuilt = true;
71
};
72
73
aarch64-android = {
74
config = "aarch64-unknown-linux-android";
75
sdkVer = "30";
76
+
ndkVer = "24";
77
libc = "bionic";
78
useAndroidPrebuilt = false;
79
useLLVM = true;
+36
-31
nixos/modules/services/misc/jellyfin.nix
+36
-31
nixos/modules/services/misc/jellyfin.nix
···
49
after = [ "network.target" ];
50
wantedBy = [ "multi-user.target" ];
51
52
serviceConfig = rec {
53
User = cfg.user;
54
Group = cfg.group;
55
StateDirectory = "jellyfin";
···
57
CacheDirectory = "jellyfin";
58
CacheDirectoryMode = "0700";
59
UMask = "0077";
60
ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
61
Restart = "on-failure";
62
63
# Security options:
64
-
65
NoNewPrivileges = true;
66
-
67
-
AmbientCapabilities = "";
68
-
CapabilityBoundingSet = "";
69
-
70
-
# ProtectClock= adds DeviceAllow=char-rtc r
71
-
DeviceAllow = "";
72
-
73
LockPersonality = true;
74
-
75
-
PrivateTmp = true;
76
-
# Disabled to allow Jellyfin to access hw accel devices endpoints
77
-
# PrivateDevices = true;
78
PrivateUsers = true;
79
-
80
-
# Disabled as it does not allow Jellyfin to interface with CUDA devices
81
-
# ProtectClock = true;
82
-
ProtectControlGroups = true;
83
-
ProtectHostname = true;
84
-
ProtectKernelLogs = true;
85
-
ProtectKernelModules = true;
86
-
ProtectKernelTunables = true;
87
-
88
RemoveIPC = true;
89
90
-
RestrictNamespaces = true;
91
-
# AF_NETLINK needed because Jellyfin monitors the network connection
92
-
RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" "AF_UNIX" ];
93
-
RestrictRealtime = true;
94
-
RestrictSUIDSGID = true;
95
-
96
-
SystemCallArchitectures = "native";
97
-
SystemCallErrorNumber = "EPERM";
98
SystemCallFilter = [
99
-
"@system-service"
100
-
"~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid"
101
];
102
};
103
};
104
···
49
after = [ "network.target" ];
50
wantedBy = [ "multi-user.target" ];
51
52
+
# This is mostly follows: https://github.com/jellyfin/jellyfin/blob/master/fedora/jellyfin.service
53
+
# Upstream also disable some hardenings when running in LXC, we do the same with the isContainer option
54
serviceConfig = rec {
55
+
Type = "simple";
56
User = cfg.user;
57
Group = cfg.group;
58
StateDirectory = "jellyfin";
···
60
CacheDirectory = "jellyfin";
61
CacheDirectoryMode = "0700";
62
UMask = "0077";
63
+
WorkingDirectory = "/var/lib/jellyfin";
64
ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
65
Restart = "on-failure";
66
+
TimeoutSec = 15;
67
+
SuccessExitStatus = ["0" "143"];
68
69
# Security options:
70
NoNewPrivileges = true;
71
+
SystemCallArchitectures = "native";
72
+
# AF_NETLINK needed because Jellyfin monitors the network connection
73
+
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
74
+
RestrictNamespaces = !config.boot.isContainer;
75
+
RestrictRealtime = true;
76
+
RestrictSUIDSGID = true;
77
+
ProtectControlGroups = !config.boot.isContainer;
78
+
ProtectHostname = true;
79
+
ProtectKernelLogs = !config.boot.isContainer;
80
+
ProtectKernelModules = !config.boot.isContainer;
81
+
ProtectKernelTunables = !config.boot.isContainer;
82
LockPersonality = true;
83
+
PrivateTmp = !config.boot.isContainer;
84
+
# needed for hardware accelaration
85
+
PrivateDevices = false;
86
PrivateUsers = true;
87
RemoveIPC = true;
88
89
SystemCallFilter = [
90
+
"~@clock"
91
+
"~@aio"
92
+
"~@chown"
93
+
"~@cpu-emulation"
94
+
"~@debug"
95
+
"~@keyring"
96
+
"~@memlock"
97
+
"~@module"
98
+
"~@mount"
99
+
"~@obsolete"
100
+
"~@privileged"
101
+
"~@raw-io"
102
+
"~@reboot"
103
+
"~@setuid"
104
+
"~@swap"
105
];
106
+
SystemCallErrorNumber = "EPERM";
107
};
108
};
109
+30
-14
nixos/modules/services/web-apps/atlassian/jira.nix
+30
-14
nixos/modules/services/web-apps/atlassian/jira.nix
···
8
9
pkg = cfg.package.override (optionalAttrs cfg.sso.enable {
10
enableSSO = cfg.sso.enable;
11
-
crowdProperties = ''
12
-
application.name ${cfg.sso.applicationName}
13
-
application.password ${cfg.sso.applicationPassword}
14
-
application.login.url ${cfg.sso.crowd}/console/
15
16
-
crowd.server.url ${cfg.sso.crowd}/services/
17
-
crowd.base.url ${cfg.sso.crowd}/
18
19
-
session.isauthenticated session.isauthenticated
20
-
session.tokenkey session.tokenkey
21
-
session.validationinterval ${toString cfg.sso.validationInterval}
22
-
session.lastvalidation session.lastvalidation
23
-
'';
24
-
});
25
26
in
27
···
112
description = "Exact name of this JIRA instance in Crowd";
113
};
114
115
-
applicationPassword = mkOption {
116
type = types.str;
117
-
description = "Application password of this JIRA instance in Crowd";
118
};
119
120
validationInterval = mkOption {
···
181
JIRA_HOME = cfg.home;
182
JAVA_HOME = "${cfg.jrePackage}";
183
CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions;
184
};
185
186
preStart = ''
···
191
-e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \
192
'') + ''
193
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
194
'';
195
196
serviceConfig = {
···
204
};
205
};
206
};
207
}
···
8
9
pkg = cfg.package.override (optionalAttrs cfg.sso.enable {
10
enableSSO = cfg.sso.enable;
11
+
});
12
13
+
crowdProperties = pkgs.writeText "crowd.properties" ''
14
+
application.name ${cfg.sso.applicationName}
15
+
application.password @NIXOS_JIRA_CROWD_SSO_PWD@
16
+
application.login.url ${cfg.sso.crowd}/console/
17
18
+
crowd.server.url ${cfg.sso.crowd}/services/
19
+
crowd.base.url ${cfg.sso.crowd}/
20
+
21
+
session.isauthenticated session.isauthenticated
22
+
session.tokenkey session.tokenkey
23
+
session.validationinterval ${toString cfg.sso.validationInterval}
24
+
session.lastvalidation session.lastvalidation
25
+
'';
26
27
in
28
···
113
description = "Exact name of this JIRA instance in Crowd";
114
};
115
116
+
applicationPasswordFile = mkOption {
117
type = types.str;
118
+
description = "Path to the file containing the application password of this JIRA instance in Crowd";
119
};
120
121
validationInterval = mkOption {
···
182
JIRA_HOME = cfg.home;
183
JAVA_HOME = "${cfg.jrePackage}";
184
CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions;
185
+
JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties";
186
};
187
188
preStart = ''
···
193
-e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \
194
'') + ''
195
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
196
+
197
+
${optionalString cfg.sso.enable ''
198
+
install -m660 ${crowdProperties} ${cfg.home}/crowd.properties
199
+
${pkgs.replace-secret}/bin/replace-secret \
200
+
'@NIXOS_JIRA_CROWD_SSO_PWD@' \
201
+
${cfg.sso.applicationPasswordFile} \
202
+
${cfg.home}/crowd.properties
203
+
''}
204
'';
205
206
serviceConfig = {
···
214
};
215
};
216
};
217
+
218
+
imports = [
219
+
(mkRemovedOptionModule [ "services" "jira" "sso" "applicationPassword" ] ''
220
+
Use `applicationPasswordFile` instead!
221
+
'')
222
+
];
223
}
-2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
-2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
···
264
if installed_version < available_version:
265
print("updating systemd-boot from %s to %s" % (installed_version, available_version))
266
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
267
-
else:
268
-
print("leaving systemd-boot %s in place (%s is not newer)" % (installed_version, available_version))
269
270
mkdir_p("@efiSysMountPoint@/efi/nixos")
271
mkdir_p("@efiSysMountPoint@/loader/entries")
···
264
if installed_version < available_version:
265
print("updating systemd-boot from %s to %s" % (installed_version, available_version))
266
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
267
268
mkdir_p("@efiSysMountPoint@/efi/nixos")
269
mkdir_p("@efiSysMountPoint@/loader/entries")
+3
-3
pkgs/applications/misc/electrum/default.nix
+3
-3
pkgs/applications/misc/electrum/default.nix
···
21
}:
22
23
let
24
-
version = "4.2.1";
25
26
libsecp256k1_name =
27
if stdenv.isLinux then "libsecp256k1.so.0"
···
37
owner = "spesmilo";
38
repo = "electrum";
39
rev = version;
40
-
sha256 = "sha256-BoikYSsQZAv8WswIr5nmBsGmjZbTXaLAbdO2QtPvc7c=";
41
42
postFetch = ''
43
mv $out ./all
···
53
54
src = fetchurl {
55
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
56
-
sha256 = "sha256-2SxSTH9P380j2KaCbkXjgmQO7K2z81AG6PMA/EMggXA=";
57
};
58
59
postUnpack = ''
···
21
}:
22
23
let
24
+
version = "4.2.2";
25
26
libsecp256k1_name =
27
if stdenv.isLinux then "libsecp256k1.so.0"
···
37
owner = "spesmilo";
38
repo = "electrum";
39
rev = version;
40
+
sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo=";
41
42
postFetch = ''
43
mv $out ./all
···
53
54
src = fetchurl {
55
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
56
+
sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs=";
57
};
58
59
postUnpack = ''
+251
pkgs/applications/misc/openbangla-keyboard/Cargo.lock
+251
pkgs/applications/misc/openbangla-keyboard/Cargo.lock
···
···
1
+
# This file is automatically @generated by Cargo.
2
+
# It is not intended for manual editing.
3
+
version = 3
4
+
5
+
[[package]]
6
+
name = "ahash"
7
+
version = "0.3.8"
8
+
source = "registry+https://github.com/rust-lang/crates.io-index"
9
+
checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
10
+
11
+
[[package]]
12
+
name = "aho-corasick"
13
+
version = "0.7.18"
14
+
source = "registry+https://github.com/rust-lang/crates.io-index"
15
+
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
16
+
dependencies = [
17
+
"memchr",
18
+
]
19
+
20
+
[[package]]
21
+
name = "autocfg"
22
+
version = "1.1.0"
23
+
source = "registry+https://github.com/rust-lang/crates.io-index"
24
+
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
25
+
26
+
[[package]]
27
+
name = "cfg-if"
28
+
version = "1.0.0"
29
+
source = "registry+https://github.com/rust-lang/crates.io-index"
30
+
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
31
+
32
+
[[package]]
33
+
name = "crossbeam-channel"
34
+
version = "0.5.5"
35
+
source = "registry+https://github.com/rust-lang/crates.io-index"
36
+
checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
37
+
dependencies = [
38
+
"cfg-if",
39
+
"crossbeam-utils",
40
+
]
41
+
42
+
[[package]]
43
+
name = "crossbeam-deque"
44
+
version = "0.8.1"
45
+
source = "registry+https://github.com/rust-lang/crates.io-index"
46
+
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
47
+
dependencies = [
48
+
"cfg-if",
49
+
"crossbeam-epoch",
50
+
"crossbeam-utils",
51
+
]
52
+
53
+
[[package]]
54
+
name = "crossbeam-epoch"
55
+
version = "0.9.9"
56
+
source = "registry+https://github.com/rust-lang/crates.io-index"
57
+
checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
58
+
dependencies = [
59
+
"autocfg",
60
+
"cfg-if",
61
+
"crossbeam-utils",
62
+
"memoffset",
63
+
"once_cell",
64
+
"scopeguard",
65
+
]
66
+
67
+
[[package]]
68
+
name = "crossbeam-utils"
69
+
version = "0.8.10"
70
+
source = "registry+https://github.com/rust-lang/crates.io-index"
71
+
checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
72
+
dependencies = [
73
+
"cfg-if",
74
+
"once_cell",
75
+
]
76
+
77
+
[[package]]
78
+
name = "edit-distance"
79
+
version = "2.1.0"
80
+
source = "registry+https://github.com/rust-lang/crates.io-index"
81
+
checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b"
82
+
83
+
[[package]]
84
+
name = "either"
85
+
version = "1.7.0"
86
+
source = "registry+https://github.com/rust-lang/crates.io-index"
87
+
checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
88
+
89
+
[[package]]
90
+
name = "hashbrown"
91
+
version = "0.8.2"
92
+
source = "registry+https://github.com/rust-lang/crates.io-index"
93
+
checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
94
+
dependencies = [
95
+
"ahash",
96
+
"autocfg",
97
+
"rayon",
98
+
"serde",
99
+
]
100
+
101
+
[[package]]
102
+
name = "hermit-abi"
103
+
version = "0.1.19"
104
+
source = "registry+https://github.com/rust-lang/crates.io-index"
105
+
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
106
+
dependencies = [
107
+
"libc",
108
+
]
109
+
110
+
[[package]]
111
+
name = "itoa"
112
+
version = "1.0.2"
113
+
source = "registry+https://github.com/rust-lang/crates.io-index"
114
+
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
115
+
116
+
[[package]]
117
+
name = "libc"
118
+
version = "0.2.126"
119
+
source = "registry+https://github.com/rust-lang/crates.io-index"
120
+
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
121
+
122
+
[[package]]
123
+
name = "memchr"
124
+
version = "2.5.0"
125
+
source = "registry+https://github.com/rust-lang/crates.io-index"
126
+
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
127
+
128
+
[[package]]
129
+
name = "memoffset"
130
+
version = "0.6.5"
131
+
source = "registry+https://github.com/rust-lang/crates.io-index"
132
+
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
133
+
dependencies = [
134
+
"autocfg",
135
+
]
136
+
137
+
[[package]]
138
+
name = "num_cpus"
139
+
version = "1.13.1"
140
+
source = "registry+https://github.com/rust-lang/crates.io-index"
141
+
checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
142
+
dependencies = [
143
+
"hermit-abi",
144
+
"libc",
145
+
]
146
+
147
+
[[package]]
148
+
name = "once_cell"
149
+
version = "1.13.0"
150
+
source = "registry+https://github.com/rust-lang/crates.io-index"
151
+
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
152
+
153
+
[[package]]
154
+
name = "rayon"
155
+
version = "1.5.3"
156
+
source = "registry+https://github.com/rust-lang/crates.io-index"
157
+
checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
158
+
dependencies = [
159
+
"autocfg",
160
+
"crossbeam-deque",
161
+
"either",
162
+
"rayon-core",
163
+
]
164
+
165
+
[[package]]
166
+
name = "rayon-core"
167
+
version = "1.9.3"
168
+
source = "registry+https://github.com/rust-lang/crates.io-index"
169
+
checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
170
+
dependencies = [
171
+
"crossbeam-channel",
172
+
"crossbeam-deque",
173
+
"crossbeam-utils",
174
+
"num_cpus",
175
+
]
176
+
177
+
[[package]]
178
+
name = "regex"
179
+
version = "1.6.0"
180
+
source = "registry+https://github.com/rust-lang/crates.io-index"
181
+
checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
182
+
dependencies = [
183
+
"aho-corasick",
184
+
"memchr",
185
+
"regex-syntax",
186
+
]
187
+
188
+
[[package]]
189
+
name = "regex-syntax"
190
+
version = "0.6.27"
191
+
source = "registry+https://github.com/rust-lang/crates.io-index"
192
+
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
193
+
194
+
[[package]]
195
+
name = "riti"
196
+
version = "0.1.0"
197
+
dependencies = [
198
+
"edit-distance",
199
+
"either",
200
+
"hashbrown",
201
+
"rayon",
202
+
"regex",
203
+
"rupantor",
204
+
"serde_json",
205
+
"stringplus",
206
+
]
207
+
208
+
[[package]]
209
+
name = "rupantor"
210
+
version = "0.3.0"
211
+
source = "registry+https://github.com/rust-lang/crates.io-index"
212
+
checksum = "04eb802986005129b0946dbb4baa420bf14cea547c5ee6b57ba081d9e85f6a4b"
213
+
dependencies = [
214
+
"serde_json",
215
+
"stringplus",
216
+
]
217
+
218
+
[[package]]
219
+
name = "ryu"
220
+
version = "1.0.10"
221
+
source = "registry+https://github.com/rust-lang/crates.io-index"
222
+
checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
223
+
224
+
[[package]]
225
+
name = "scopeguard"
226
+
version = "1.1.0"
227
+
source = "registry+https://github.com/rust-lang/crates.io-index"
228
+
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
229
+
230
+
[[package]]
231
+
name = "serde"
232
+
version = "1.0.139"
233
+
source = "registry+https://github.com/rust-lang/crates.io-index"
234
+
checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
235
+
236
+
[[package]]
237
+
name = "serde_json"
238
+
version = "1.0.82"
239
+
source = "registry+https://github.com/rust-lang/crates.io-index"
240
+
checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
241
+
dependencies = [
242
+
"itoa",
243
+
"ryu",
244
+
"serde",
245
+
]
246
+
247
+
[[package]]
248
+
name = "stringplus"
249
+
version = "0.1.0"
250
+
source = "registry+https://github.com/rust-lang/crates.io-index"
251
+
checksum = "9057d3b491a3eee749e52560657c4d93b0badc04fb3fa8dae3c942c5c066f222"
+72
pkgs/applications/misc/openbangla-keyboard/default.nix
+72
pkgs/applications/misc/openbangla-keyboard/default.nix
···
···
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, pkg-config
6
+
, rustPlatform
7
+
, wrapQtAppsHook
8
+
, ibus
9
+
, qtbase
10
+
, zstd
11
+
}:
12
+
13
+
stdenv.mkDerivation rec {
14
+
pname = "openbangla-keyboard";
15
+
version = "2.0.0";
16
+
17
+
src = fetchFromGitHub {
18
+
owner = "openbangla";
19
+
repo = "openbangla-keyboard";
20
+
rev = version;
21
+
hash = "sha256-UoLiysaA0Wob/SLBqm36Txqb8k7bwoQ56h8ZufHR74I=";
22
+
fetchSubmodules = true;
23
+
};
24
+
25
+
nativeBuildInputs = [
26
+
cmake
27
+
pkg-config
28
+
rustPlatform.rust.cargo
29
+
rustPlatform.rust.rustc
30
+
rustPlatform.cargoSetupHook
31
+
wrapQtAppsHook
32
+
];
33
+
34
+
buildInputs = [
35
+
ibus
36
+
qtbase
37
+
zstd
38
+
];
39
+
40
+
cargoDeps = rustPlatform.fetchCargoTarball {
41
+
inherit src;
42
+
postPatch = ''
43
+
cp ${./Cargo.lock} Cargo.lock
44
+
'';
45
+
sourceRoot = "source/${cargoRoot}";
46
+
sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34=";
47
+
};
48
+
49
+
cargoRoot = "src/engine/riti";
50
+
postPatch = ''
51
+
cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock
52
+
53
+
substituteInPlace CMakeLists.txt \
54
+
--replace "/usr" "$out"
55
+
56
+
substituteInPlace src/shared/FileSystem.cpp \
57
+
--replace "/usr" "$out"
58
+
'';
59
+
60
+
postInstall = ''
61
+
mkdir -p $out/bin
62
+
ln -s $out/share/openbangla-keyboard/openbangla-gui $out/bin/openbangla-gui
63
+
'';
64
+
65
+
meta = with lib; {
66
+
description = "An OpenSource, Unicode compliant Bengali Input Method";
67
+
homepage = "https://openbangla.github.io/";
68
+
license = licenses.gpl3Plus;
69
+
maintainers = with maintainers; [ hqurve ];
70
+
platforms = platforms.linux;
71
+
};
72
+
}
+2
-2
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+2
-2
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
···
1
{ lib, buildDunePackage, fetchFromGitHub
2
-
, ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3
3
, tiny_httpd
4
, ounit
5
}:
···
18
doCheck = true;
19
checkInputs = [ ounit ];
20
21
-
buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 tiny_httpd ];
22
23
meta = {
24
inherit (src.meta) homepage;
···
1
{ lib, buildDunePackage, fetchFromGitHub
2
+
, ocaml_extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
3
, tiny_httpd
4
, ounit
5
}:
···
18
doCheck = true;
19
checkInputs = [ ounit ];
20
21
+
buildInputs = [ ocaml_extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
22
23
meta = {
24
inherit (src.meta) homepage;
+83
-39
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+83
-39
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
···
1
-
{ lib, stdenv
2
-
, makeWrapper
3
-
, runCommand, wrapBintoolsWith, wrapCCWith
4
, buildAndroidndk, androidndk, targetAndroidndkPkgs
5
}:
6
···
11
# N.B. The Android NDK uses slightly different LLVM-style platform triples
12
# than we do. We don't just use theirs because ours are less ambiguous and
13
# some builds need that clarity.
14
ndkInfoFun = { config, ... }: {
15
x86_64-apple-darwin = {
16
double = "darwin-x86_64";
···
21
i686-unknown-linux-android = {
22
triple = "i686-linux-android";
23
arch = "x86";
24
-
toolchain = "x86";
25
-
gccVer = "4.9";
26
};
27
x86_64-unknown-linux-android = {
28
triple = "x86_64-linux-android";
29
arch = "x86_64";
30
-
toolchain = "x86_64";
31
-
gccVer = "4.9";
32
};
33
armv7a-unknown-linux-androideabi = {
34
arch = "arm";
35
triple = "arm-linux-androideabi";
36
-
toolchain = "arm-linux-androideabi";
37
-
gccVer = "4.9";
38
};
39
aarch64-unknown-linux-android = {
40
arch = "arm64";
41
triple = "aarch64-linux-android";
42
-
toolchain = "aarch64-linux-android";
43
-
gccVer = "4.9";
44
};
45
}.${config} or
46
(throw "Android NDK doesn't support ${config}, as far as we know");
47
48
hostInfo = ndkInfoFun stdenv.hostPlatform;
49
targetInfo = ndkInfoFun stdenv.targetPlatform;
50
51
-
prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
52
in
53
54
rec {
55
# Misc tools
56
-
binaries = runCommand "ndk-toolchain-binutils" {
57
-
pname = "ndk-toolchain-binutils";
58
inherit (androidndk) version;
59
-
nativeBuildInputs = [ makeWrapper ];
60
propagatedBuildInputs = [ androidndk ];
61
passthru = {
62
-
targetPrefix = prefix;
63
isClang = true; # clang based cc, but bintools ld
64
};
65
-
} ''
66
-
mkdir -p $out/bin
67
68
-
# llvm toolchain
69
-
for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/bin/*; do
70
-
ln -s $prog $out/bin/$(basename $prog)
71
-
ln -s $prog $out/bin/${prefix}$(basename $prog)
72
-
done
73
74
-
# bintools toolchain
75
-
for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin/*; do
76
-
prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//')
77
-
ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix
78
-
done
79
80
-
# shitty googly wrappers
81
-
rm -f $out/bin/${stdenv.targetPlatform.config}-gcc $out/bin/${stdenv.targetPlatform.config}-g++
82
-
'';
83
84
binutils = wrapBintoolsWith {
85
bintools = binaries;
···
95
libc = targetAndroidndkPkgs.libraries;
96
extraBuildCommands = ''
97
echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
98
-
echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
99
-
echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags
100
-
echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags
101
'';
102
};
103
···
107
# cross-compiling packages to wrap incorrectly wrap binaries we don't include
108
# anyways.
109
libraries = runCommand "bionic-prebuilt" {} ''
110
-
mkdir -p $out
111
-
cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
112
-
chmod +w $out/include
113
-
cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
114
-
ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib
115
'';
116
}
···
1
+
{ lib, stdenv, makeWrapper
2
+
, runCommand, wrapBintoolsWith, wrapCCWith, autoPatchelfHook
3
, buildAndroidndk, androidndk, targetAndroidndkPkgs
4
}:
5
···
10
# N.B. The Android NDK uses slightly different LLVM-style platform triples
11
# than we do. We don't just use theirs because ours are less ambiguous and
12
# some builds need that clarity.
13
+
#
14
+
# FIXME:
15
+
# There's some dragons here. Build host and target concepts are being mixed up.
16
ndkInfoFun = { config, ... }: {
17
x86_64-apple-darwin = {
18
double = "darwin-x86_64";
···
23
i686-unknown-linux-android = {
24
triple = "i686-linux-android";
25
arch = "x86";
26
};
27
x86_64-unknown-linux-android = {
28
triple = "x86_64-linux-android";
29
arch = "x86_64";
30
};
31
armv7a-unknown-linux-androideabi = {
32
arch = "arm";
33
triple = "arm-linux-androideabi";
34
};
35
aarch64-unknown-linux-android = {
36
arch = "arm64";
37
triple = "aarch64-linux-android";
38
};
39
}.${config} or
40
(throw "Android NDK doesn't support ${config}, as far as we know");
41
42
+
buildInfo = ndkInfoFun stdenv.buildPlatform;
43
hostInfo = ndkInfoFun stdenv.hostPlatform;
44
targetInfo = ndkInfoFun stdenv.targetPlatform;
45
46
+
inherit (stdenv.targetPlatform) sdkVer;
47
+
suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config;
48
+
49
+
# targetInfo.triple is what Google thinks the toolchain should be, this is a little
50
+
# different from what we use. We make it four parts to conform with the existing
51
+
# standard more properly.
52
+
targetConfig = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config);
53
in
54
55
rec {
56
# Misc tools
57
+
binaries = stdenv.mkDerivation {
58
+
pname = "${targetConfig}-ndk-toolchain";
59
inherit (androidndk) version;
60
+
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
61
propagatedBuildInputs = [ androidndk ];
62
passthru = {
63
isClang = true; # clang based cc, but bintools ld
64
};
65
+
dontUnpack = true;
66
+
dontBuild = true;
67
+
dontStrip = true;
68
+
dontConfigure = true;
69
+
dontPatch = true;
70
+
autoPatchelfIgnoreMissingDeps = true;
71
+
installPhase = ''
72
+
# https://developer.android.com/ndk/guides/other_build_systems
73
+
mkdir -p $out
74
+
cp -r ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double} $out/toolchain
75
+
find $out/toolchain -type d -exec chmod 777 {} \;
76
77
+
if [ ! -d $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer} ]; then
78
+
echo "NDK does not contain libraries for SDK version ${sdkVer}";
79
+
exit 1
80
+
fi
81
82
+
ln -vfs $out/toolchain/sysroot/usr/lib $out/lib
83
+
ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.so $out/lib/
84
+
ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.a $out/lib/
85
+
chmod +w $out/lib/*
86
+
ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}/*.so $out/lib/
87
+
ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}/*.o $out/lib/
88
89
+
echo "INPUT(-lc++_static)" > $out/lib/libc++.a
90
+
91
+
ln -s $out/toolchain/bin $out/bin
92
+
ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/
93
+
for f in $out/bin/${targetInfo.triple}-*; do
94
+
ln -s $f ''${f/${targetInfo.triple}-/${targetConfig}-}
95
+
done
96
+
for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do
97
+
ln -s $f ''${f/${targetInfo.triple}/${targetConfig}}
98
+
done
99
+
100
+
rm -f $out/bin/${targetConfig}-ld
101
+
ln -s $out/bin/lld $out/bin/${targetConfig}-ld
102
+
103
+
(cd $out/bin;
104
+
for tool in llvm-*; do
105
+
ln -sf $tool ${targetConfig}-$(echo $tool | sed 's/llvm-//')
106
+
ln -sf $tool $(echo $tool | sed 's/llvm-//')
107
+
done)
108
+
109
+
# handle last, as llvm-as is for llvm bytecode
110
+
ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetConfig}-as
111
+
ln -sf $out/bin/${targetInfo.triple}-as $out/bin/as
112
+
113
+
patchShebangs $out/bin
114
+
'';
115
+
};
116
117
binutils = wrapBintoolsWith {
118
bintools = binaries;
···
128
libc = targetAndroidndkPkgs.libraries;
129
extraBuildCommands = ''
130
echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
131
+
# Android needs executables linked with -pie since version 5.0
132
+
# Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags
133
+
echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags
134
+
echo "-z,noexecstack -z,relro -z,now" >> $out/nix-support/cc-ldflags
135
+
echo 'if [[ ! " $@ " =~ " -shared " ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh
136
+
echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags
137
+
if [ ${targetInfo.triple} == arm-linux-androideabi ]; then
138
+
# https://android.googlesource.com/platform/external/android-cmake/+/refs/heads/cmake-master-dev/android.toolchain.cmake
139
+
echo "--fix-cortex-a8" >> $out/nix-support/cc-ldflags
140
+
fi
141
'';
142
};
143
···
147
# cross-compiling packages to wrap incorrectly wrap binaries we don't include
148
# anyways.
149
libraries = runCommand "bionic-prebuilt" {} ''
150
+
lpath=${buildAndroidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double}/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}
151
+
if [ ! -d $lpath ]; then
152
+
echo "NDK does not contain libraries for SDK version ${sdkVer} <$lpath>"
153
+
exit 1
154
+
fi
155
+
mkdir -p $out/lib
156
+
cp $lpath/*.so $lpath/*.a $out/lib
157
+
chmod +w $out/lib/*
158
+
cp $lpath/* $out/lib
159
'';
160
}
+38
-8
pkgs/development/androidndk-pkgs/default.nix
+38
-8
pkgs/development/androidndk-pkgs/default.nix
···
2
}:
3
4
{
5
-
"18b" =
6
let
7
-
ndkVersion = "18.1.5063045";
8
9
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
10
includeNDK = true;
···
19
import ./androidndk-pkgs.nix {
20
inherit lib;
21
inherit (buildPackages)
22
-
makeWrapper;
23
inherit (pkgs)
24
stdenv
25
runCommand wrapBintoolsWith wrapCCWith;
···
29
# these two really are the same.
30
buildAndroidndk = buildAndroidComposition.ndk-bundle;
31
androidndk = androidComposition.ndk-bundle;
32
-
targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b;
33
};
34
35
-
"21" =
36
let
37
-
ndkVersion = "21.0.6113669";
38
39
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
40
includeNDK = true;
···
49
import ./androidndk-pkgs.nix {
50
inherit lib;
51
inherit (buildPackages)
52
-
makeWrapper;
53
inherit (pkgs)
54
stdenv
55
runCommand wrapBintoolsWith wrapCCWith;
···
59
# these two really are the same.
60
buildAndroidndk = buildAndroidComposition.ndk-bundle;
61
androidndk = androidComposition.ndk-bundle;
62
-
targetAndroidndkPkgs = targetPackages.androidndkPkgs_21;
63
};
64
65
}
···
2
}:
3
4
{
5
+
"21" =
6
let
7
+
ndkVersion = "21.0.6113669";
8
9
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
10
includeNDK = true;
···
19
import ./androidndk-pkgs.nix {
20
inherit lib;
21
inherit (buildPackages)
22
+
makeWrapper autoPatchelfHook;
23
inherit (pkgs)
24
stdenv
25
runCommand wrapBintoolsWith wrapCCWith;
···
29
# these two really are the same.
30
buildAndroidndk = buildAndroidComposition.ndk-bundle;
31
androidndk = androidComposition.ndk-bundle;
32
+
targetAndroidndkPkgs = targetPackages.androidndkPkgs_21;
33
};
34
35
+
"23b" =
36
let
37
+
ndkVersion = "23.1.7779620";
38
39
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
40
includeNDK = true;
···
49
import ./androidndk-pkgs.nix {
50
inherit lib;
51
inherit (buildPackages)
52
+
makeWrapper autoPatchelfHook;
53
inherit (pkgs)
54
stdenv
55
runCommand wrapBintoolsWith wrapCCWith;
···
59
# these two really are the same.
60
buildAndroidndk = buildAndroidComposition.ndk-bundle;
61
androidndk = androidComposition.ndk-bundle;
62
+
targetAndroidndkPkgs = targetPackages.androidndkPkgs_23b;
63
+
};
64
+
65
+
"24" =
66
+
let
67
+
ndkVersion = "24.0.8215888";
68
+
69
+
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
70
+
includeNDK = true;
71
+
inherit ndkVersion;
72
+
};
73
+
74
+
androidComposition = androidenv.composeAndroidPackages {
75
+
includeNDK = true;
76
+
inherit ndkVersion;
77
+
};
78
+
in
79
+
import ./androidndk-pkgs.nix {
80
+
inherit lib;
81
+
inherit (buildPackages)
82
+
makeWrapper autoPatchelfHook;
83
+
inherit (pkgs)
84
+
stdenv
85
+
runCommand wrapBintoolsWith wrapCCWith;
86
+
# buildPackages.foo rather than buildPackages.buildPackages.foo would work,
87
+
# but for splicing messing up on infinite recursion for the variants we
88
+
# *dont't* use. Using this workaround, but also making a test to ensure
89
+
# these two really are the same.
90
+
buildAndroidndk = buildAndroidComposition.ndk-bundle;
91
+
androidndk = androidComposition.ndk-bundle;
92
+
targetAndroidndkPkgs = targetPackages.androidndkPkgs_24;
93
};
94
95
}
+3
-3
pkgs/development/compilers/purescript/purescript/default.nix
+3
-3
pkgs/development/compilers/purescript/purescript/default.nix
···
18
19
in stdenv.mkDerivation rec {
20
pname = "purescript";
21
-
version = "0.15.2";
22
23
# These hashes can be updated automatically by running the ./update.sh script.
24
src =
···
26
then
27
fetchurl {
28
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
29
-
sha256 = "06fsq9ynfvfqn3ac5jxdj81lmzd6bh84p7jz5qib31h27iy5aq4h";
30
}
31
else
32
fetchurl {
33
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
34
-
sha256 = "1p37k6briczw6gvw04idkx734ms1swgrx9sl4hi6xwvxkfp1nm0m";
35
};
36
37
···
18
19
in stdenv.mkDerivation rec {
20
pname = "purescript";
21
+
version = "0.15.4";
22
23
# These hashes can be updated automatically by running the ./update.sh script.
24
src =
···
26
then
27
fetchurl {
28
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
29
+
sha256 = "0rksc6c98pp48lcavair6apjpgq3s1zz0lhkc59vbz67c8zxc26d";
30
}
31
else
32
fetchurl {
33
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
34
+
sha256 = "13p6qsba6kmcsppc3z6vcm3v5c7jxhp10nyvxry4nmj9mkdmjaiy";
35
};
36
37
+5
-1
pkgs/development/libraries/folly/default.nix
+5
-1
pkgs/development/libraries/folly/default.nix
···
16
, xz
17
, zlib
18
, zstd
19
+
, jemalloc
20
, follyMobile ? false
21
}:
22
···
51
libunwind
52
fmt_8
53
zstd
54
+
] ++ lib.optional stdenv.isLinux jemalloc;
55
+
56
+
# jemalloc headers are required in include/folly/portability/Malloc.h
57
+
propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc;
58
59
NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ];
60
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+9
-4
pkgs/development/libraries/science/math/p4est/default.nix
+9
-4
pkgs/development/libraries/science/math/p4est/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub
2
-
, autoreconfHook, pkg-config
3
, p4est-withMetis ? true, metis
4
, p4est-sc
5
}:
···
31
postPatch = ''
32
sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am
33
'';
34
-
preConfigure = ''
35
echo "2.8.0" > .tarball-version
36
-
${if mpiSupport then "unset CC" else ""}
37
'';
38
39
configureFlags = p4est-sc.configureFlags
···
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, autoreconfHook
5
+
, pkg-config
6
, p4est-withMetis ? true, metis
7
, p4est-sc
8
}:
···
34
postPatch = ''
35
sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am
36
'';
37
+
preAutoreconf = ''
38
echo "2.8.0" > .tarball-version
39
+
'';
40
+
preConfigure = lib.optionalString mpiSupport ''
41
+
unset CC
42
'';
43
44
configureFlags = p4est-sc.configureFlags
+3
-3
pkgs/development/mobile/androidenv/compose-android-packages.nix
+3
-3
pkgs/development/mobile/androidenv/compose-android-packages.nix
···
3
}:
4
5
{ toolsVersion ? "26.1.1"
6
-
, platformToolsVersion ? "33.0.1"
7
, buildToolsVersions ? [ "32.0.0" ]
8
, includeEmulator ? false
9
, emulatorVersion ? "31.3.7"
···
11
, includeSources ? false
12
, includeSystemImages ? false
13
, systemImageTypes ? [ "google_apis_playstore" ]
14
-
, abiVersions ? [ "armeabi-v7a" ]
15
, cmakeVersions ? [ ]
16
, includeNDK ? false
17
, ndkVersion ? "24.0.8215888"
···
181
makeNdkBundle = ndkVersion:
182
import ./ndk-bundle {
183
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv;
184
-
package = packages.ndk-bundle.${ndkVersion};
185
};
186
187
# All NDK bundles.
···
3
}:
4
5
{ toolsVersion ? "26.1.1"
6
+
, platformToolsVersion ? "33.0.2"
7
, buildToolsVersions ? [ "32.0.0" ]
8
, includeEmulator ? false
9
, emulatorVersion ? "31.3.7"
···
11
, includeSources ? false
12
, includeSystemImages ? false
13
, systemImageTypes ? [ "google_apis_playstore" ]
14
+
, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ]
15
, cmakeVersions ? [ ]
16
, includeNDK ? false
17
, ndkVersion ? "24.0.8215888"
···
181
makeNdkBundle = ndkVersion:
182
import ./ndk-bundle {
183
inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv;
184
+
package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion};
185
};
186
187
# All NDK bundles.
+10
-11
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+10
-11
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
···
12
nativeBuildInputs = [ makeWrapper ]
13
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
14
autoPatchelfIgnoreMissingDeps = true;
15
-
buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ];
16
patchInstructions = lib.optionalString (os == "linux") (''
17
patchShebangs .
18
19
-
# Fix the shebangs of the auto-generated scripts.
20
-
substituteInPlace ./build/tools/make_standalone_toolchain.py \
21
-
--replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash'
22
-
23
-
'' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) ''
24
-
patch -p1 \
25
-
--no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true
26
-
wrapProgram ./build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
27
-
'' + ''
28
-
29
# TODO: allow this stuff
30
rm -rf docs tests
31
32
# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
33
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then
···
12
nativeBuildInputs = [ makeWrapper ]
13
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
14
autoPatchelfIgnoreMissingDeps = true;
15
+
buildInputs = lib.optional (os == "linux") [ pkgs.zlib ];
16
patchInstructions = lib.optionalString (os == "linux") (''
17
patchShebangs .
18
19
# TODO: allow this stuff
20
rm -rf docs tests
21
+
22
+
# Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink
23
+
# to still support the old standalone toolchains builds.
24
+
if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
25
+
ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle
26
+
else
27
+
echo "The ndk-bundle layout has changed. The nix expressions have to be updated!"
28
+
exit 1
29
+
fi
30
31
# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
32
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then
-44
pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
-44
pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch
···
1
-
diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py
2
-
--- android-ndk-r18b/build/tools/make_standalone_toolchain.py 2018-10-11 12:49:38.000000000 +0200
3
-
+++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py 2018-11-20 21:55:52.689991420 +0100
4
-
@@ -30,7 +30,7 @@
5
-
import sys
6
-
import tempfile
7
-
import textwrap
8
-
-
9
-
+import subprocess
10
-
11
-
THIS_DIR = os.path.realpath(os.path.dirname(__file__))
12
-
NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..'))
13
-
@@ -173,6 +173,7 @@
14
-
logger().debug('Copying %s', src_file)
15
-
shutil.copy2(src_file, dst_dir)
16
-
17
-
+ subprocess.check_call(["chmod", "-R", "+w", dst])
18
-
19
-
def make_clang_scripts(install_dir, triple, api, windows):
20
-
"""Creates Clang wrapper scripts.
21
-
@@ -365,6 +366,7 @@
22
-
install_headers = os.path.join(install_sysroot, 'usr/include')
23
-
os.makedirs(os.path.dirname(install_headers))
24
-
shutil.copytree(headers, install_headers)
25
-
+ subprocess.check_call(["chmod", "-R", "+w", install_path])
26
-
27
-
arch_headers = os.path.join(sysroot, 'usr/include', triple)
28
-
copy_directory_contents(arch_headers, os.path.join(install_headers))
29
-
@@ -375,6 +377,7 @@
30
-
install_sysroot, 'usr/lib{}'.format(lib_suffix))
31
-
if os.path.exists(lib_path):
32
-
shutil.copytree(lib_path, lib_install)
33
-
+ subprocess.check_call(["chmod", "-R", "+w", install_path])
34
-
35
-
static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
36
-
static_lib_install = os.path.join(install_sysroot, 'usr/lib')
37
-
@@ -389,6 +392,7 @@
38
-
NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
39
-
gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
40
-
shutil.copytree(gdbserver_path, gdbserver_install)
41
-
+ subprocess.check_call(["chmod", "-R", "+w", install_path])
42
-
43
-
toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
44
-
dirs = os.listdir(toolchain_lib_dir)
···
+326
-72
pkgs/development/mobile/androidenv/repo.json
+326
-72
pkgs/development/mobile/androidenv/repo.json
···
1241
},
1242
"23": {
1243
"google_apis": {
1244
"armeabi-v7a": {
1245
"archives": [
1246
{
···
1663
}
1664
}
1665
},
1666
"Tiramisu": {
1667
"google_apis_playstore": {
1668
"arm64-v8a": {
1669
"archives": [
1670
{
1671
"os": "macosx",
1672
-
"sha1": "2b6d4dc0af98b2b4d3ed4ac82b6d8ee0bfe38383",
1673
-
"size": 1457296537,
1674
-
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Tiramisu_r02-darwin.zip"
1675
},
1676
{
1677
"os": "linux",
1678
-
"sha1": "2b6d4dc0af98b2b4d3ed4ac82b6d8ee0bfe38383",
1679
-
"size": 1457296537,
1680
-
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Tiramisu_r02-linux.zip"
1681
}
1682
],
1683
"displayName": "Google Play ARM 64 v8a System Image",
1684
"license": "android-sdk-arm-dbt-license",
1685
-
"name": "system-image-Tiramisu-google_apis_playstore-arm64-v8a",
1686
-
"path": "system-images/android-Tiramisu/google_apis_playstore/arm64-v8a",
1687
-
"revision": "Tiramisu-google_apis_playstore-arm64-v8a"
1688
},
1689
"x86_64": {
1690
"archives": [
1691
{
1692
"os": "all",
1693
-
"sha1": "2d2fb4c36efa836f348d6acbfc588f9eed70934e",
1694
-
"size": 1438511715,
1695
-
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-Tiramisu_r02.zip"
1696
}
1697
],
1698
"displayName": "Google Play Intel x86 Atom_64 System Image",
1699
"license": "android-sdk-preview-license",
1700
-
"name": "system-image-Tiramisu-google_apis_playstore-x86_64",
1701
-
"path": "system-images/android-Tiramisu/google_apis_playstore/x86_64",
1702
-
"revision": "Tiramisu-google_apis_playstore-x86_64"
1703
}
1704
}
1705
}
···
3298
"path": "build-tools/32.1.0-rc1",
3299
"revision": "32.1.0-rc1"
3300
},
3301
-
"33.0.0-rc2": {
3302
"archives": [
3303
{
3304
-
"os": "windows",
3305
-
"sha1": "789aa6dfb2155b81e073108c70982f73c890a95b",
3306
-
"size": 55466255,
3307
-
"url": "https://dl.google.com/android/repository/830151c9e0c410f6148390f0de30bd349ba91efd.build-tools_r33-rc2-windows.zip"
3308
-
},
3309
-
{
3310
"os": "linux",
3311
-
"sha1": "013f98217b7af4f5677ab1a47e98da18ad57721c",
3312
-
"size": 57876882,
3313
-
"url": "https://dl.google.com/android/repository/build-tools_r33-rc2-linux.zip"
3314
},
3315
{
3316
"os": "macosx",
3317
-
"sha1": "586f8f77847ba3899b7652d6514e8c6a78ab673a",
3318
-
"size": 59910819,
3319
-
"url": "https://dl.google.com/android/repository/f8baa248444f0a5aca1119b48e897908a3da49d5.build-tools_r33-rc2-macosx.zip"
3320
}
3321
],
3322
-
"displayName": "Android SDK Build-Tools 33-rc2",
3323
-
"license": "android-sdk-preview-license",
3324
"name": "build-tools",
3325
-
"path": "build-tools/33.0.0-rc2",
3326
-
"revision": "33.0.0-rc2"
3327
}
3328
},
3329
"cmake": {
···
3625
"name": "cmdline-tools",
3626
"path": "cmdline-tools/6.0",
3627
"revision": "6.0"
3628
}
3629
},
3630
"emulator": {
3631
-
"31.2.9": {
3632
"archives": [
3633
{
3634
"os": "linux",
3635
-
"sha1": "164b759748b3d2ee2616da74173867b11b18f64f",
3636
-
"size": 276337192,
3637
-
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8316981.zip"
3638
},
3639
{
3640
"os": "windows",
3641
-
"sha1": "2b6768485a8e6492823a9156fa43c55092afd533",
3642
-
"size": 345298639,
3643
-
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8316981.zip"
3644
},
3645
{
3646
"os": "macosx",
3647
-
"sha1": "af2d950318d8ae8cc516a1401a94f888f615aca6",
3648
-
"size": 313877066,
3649
-
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8316981.zip"
3650
}
3651
],
3652
"displayName": "Android Emulator",
3653
"license": "android-sdk-license",
3654
"name": "emulator",
3655
"path": "emulator",
3656
-
"revision": "31.2.9"
3657
},
3658
-
"31.3.7": {
3659
"archives": [
3660
{
3661
"os": "macosx",
3662
-
"sha1": "0020b44623995a5a9a5b0d114f8fd942e9d3cbed",
3663
-
"size": 347204784,
3664
-
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8408431.zip"
3665
},
3666
{
3667
"os": "linux",
3668
-
"sha1": "46ba0c398fcd2704bee015c95e44d8f317b7b720",
3669
-
"size": 293765376,
3670
-
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8408431.zip"
3671
},
3672
{
3673
"os": "windows",
3674
-
"sha1": "c09a35dd8c7eb7d8c53bf89c86019f5dbcd89b9d",
3675
-
"size": 380137986,
3676
-
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8408431.zip"
3677
}
3678
],
3679
"displayName": "Android Emulator",
3680
"license": "android-sdk-preview-license",
3681
"name": "emulator",
3682
"path": "emulator",
3683
-
"revision": "31.3.7"
3684
}
3685
},
3686
"extras": {
···
4523
"path": "ndk/23.1.7779620",
4524
"revision": "23.1.7779620"
4525
},
4526
"24.0.7856742-rc1": {
4527
"archives": [
4528
{
···
4684
"name": "ndk",
4685
"path": "ndk/25.0.8221429",
4686
"revision": "25.0.8221429-rc2"
4687
}
4688
},
4689
"ndk-bundle": {
···
5381
}
5382
},
5383
"platform-tools": {
5384
-
"33.0.1": {
5385
"archives": [
5386
{
5387
"os": "macosx",
5388
-
"sha1": "82f7c23e9e4acf6c86991bb23cd5d9f861f7819f",
5389
-
"size": 13131422,
5390
-
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-darwin.zip"
5391
},
5392
{
5393
"os": "linux",
5394
-
"sha1": "4792ee4593e8e2395ddb87a3e82d60629eb0e977",
5395
-
"size": 7449306,
5396
-
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-linux.zip"
5397
},
5398
{
5399
"os": "windows",
5400
-
"sha1": "e91ab59b5ddc5e387c5171b37c3813eaa2fa3846",
5401
-
"size": 6331279,
5402
-
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-windows.zip"
5403
}
5404
],
5405
"displayName": "Android SDK Platform-Tools",
5406
"license": "android-sdk-license",
5407
"name": "platform-tools",
5408
"path": "platform-tools",
5409
-
"revision": "33.0.1"
5410
}
5411
},
5412
"platforms": {
···
5809
"path": "platforms/android-32",
5810
"revision": "32"
5811
},
5812
"4": {
5813
"archives": [
5814
{
···
5935
"path": "platforms/android-9",
5936
"revision": "9"
5937
},
5938
-
"Tiramisu": {
5939
"archives": [
5940
{
5941
"os": "all",
5942
-
"sha1": "2ac79862a909392d68d8ad503c45809e725d71f6",
5943
-
"size": 67290653,
5944
-
"url": "https://dl.google.com/android/repository/platform-Tiramisu_r02.zip"
5945
}
5946
],
5947
-
"displayName": "Android SDK Platform Tiramisu",
5948
"license": "android-sdk-license",
5949
"name": "platforms",
5950
-
"path": "platforms/android-Tiramisu",
5951
-
"revision": "Tiramisu"
5952
}
5953
},
5954
"skiaparser": {
···
6304
"name": "sources",
6305
"path": "sources/android-31",
6306
"revision": "31"
6307
}
6308
},
6309
"tools": {
···
1241
},
1242
"23": {
1243
"google_apis": {
1244
+
"arm64-v8a": {
1245
+
"archives": [
1246
+
{
1247
+
"os": "all",
1248
+
"sha1": "2d1ae21b1978e202917b7c6a5f49ab8bc87c6417",
1249
+
"size": 493891214,
1250
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-23_r33.zip"
1251
+
}
1252
+
],
1253
+
"displayName": "Google APIs ARM 64 v8a System Image",
1254
+
"license": "android-sdk-license",
1255
+
"name": "system-image-23-google_apis-arm64-v8a",
1256
+
"path": "system-images/android-23/google_apis/arm64-v8a",
1257
+
"revision": "23-google_apis-arm64-v8a"
1258
+
},
1259
"armeabi-v7a": {
1260
"archives": [
1261
{
···
1678
}
1679
}
1680
},
1681
+
"33": {
1682
+
"google_apis_playstore": {
1683
+
"arm64-v8a": {
1684
+
"archives": [
1685
+
{
1686
+
"os": "macosx",
1687
+
"sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764",
1688
+
"size": 1492105537,
1689
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-darwin.zip"
1690
+
},
1691
+
{
1692
+
"os": "linux",
1693
+
"sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764",
1694
+
"size": 1492105537,
1695
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-linux.zip"
1696
+
}
1697
+
],
1698
+
"displayName": "Google Play ARM 64 v8a System Image",
1699
+
"license": "android-sdk-arm-dbt-license",
1700
+
"name": "system-image-33-google_apis_playstore-arm64-v8a",
1701
+
"path": "system-images/android-33/google_apis_playstore/arm64-v8a",
1702
+
"revision": "33-google_apis_playstore-arm64-v8a"
1703
+
},
1704
+
"x86_64": {
1705
+
"archives": [
1706
+
{
1707
+
"os": "all",
1708
+
"sha1": "ed2931ebef4f7bedff8610254748d6496ce5d3c4",
1709
+
"size": 1496628942,
1710
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r05.zip"
1711
+
}
1712
+
],
1713
+
"displayName": "Google Play Intel x86 Atom_64 System Image",
1714
+
"license": "android-sdk-preview-license",
1715
+
"name": "system-image-33-google_apis_playstore-x86_64",
1716
+
"path": "system-images/android-33/google_apis_playstore/x86_64",
1717
+
"revision": "33-google_apis_playstore-x86_64"
1718
+
}
1719
+
}
1720
+
},
1721
"Tiramisu": {
1722
+
"android-tv": {
1723
+
"arm64-v8a": {
1724
+
"archives": [
1725
+
{
1726
+
"os": "all",
1727
+
"sha1": "4b70bed5ffb28162cdde7852e0597d957910270d",
1728
+
"size": 840304267,
1729
+
"url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-Tiramisu_r03.zip"
1730
+
}
1731
+
],
1732
+
"displayName": "Android TV ARM 64 v8a System Image",
1733
+
"license": "android-sdk-license",
1734
+
"name": "system-image-Tiramisu-android-tv-arm64-v8a",
1735
+
"path": "system-images/android-Tiramisu/android-tv/arm64-v8a",
1736
+
"revision": "Tiramisu-android-tv-arm64-v8a"
1737
+
},
1738
+
"x86": {
1739
+
"archives": [
1740
+
{
1741
+
"os": "all",
1742
+
"sha1": "547a24d9dec83e11486ef4ea45848d9fa99f35c2",
1743
+
"size": 832895525,
1744
+
"url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-Tiramisu_r03.zip"
1745
+
}
1746
+
],
1747
+
"displayName": "Android TV Intel x86 Atom System Image",
1748
+
"license": "android-sdk-license",
1749
+
"name": "system-image-Tiramisu-android-tv-x86",
1750
+
"path": "system-images/android-Tiramisu/android-tv/x86",
1751
+
"revision": "Tiramisu-android-tv-x86"
1752
+
}
1753
+
}
1754
+
},
1755
+
"TiramisuPrivacySandbox": {
1756
"google_apis_playstore": {
1757
"arm64-v8a": {
1758
"archives": [
1759
{
1760
"os": "macosx",
1761
+
"sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2",
1762
+
"size": 1514681298,
1763
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-darwin.zip"
1764
},
1765
{
1766
"os": "linux",
1767
+
"sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2",
1768
+
"size": 1514681298,
1769
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-linux.zip"
1770
}
1771
],
1772
"displayName": "Google Play ARM 64 v8a System Image",
1773
"license": "android-sdk-arm-dbt-license",
1774
+
"name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a",
1775
+
"path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a",
1776
+
"revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a"
1777
},
1778
"x86_64": {
1779
"archives": [
1780
{
1781
"os": "all",
1782
+
"sha1": "2a4ea6ce714155ea8ddfea26cf61ad219f32c02a",
1783
+
"size": 1519169526,
1784
+
"url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r05.zip"
1785
}
1786
],
1787
"displayName": "Google Play Intel x86 Atom_64 System Image",
1788
"license": "android-sdk-preview-license",
1789
+
"name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64",
1790
+
"path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64",
1791
+
"revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64"
1792
}
1793
}
1794
}
···
3387
"path": "build-tools/32.1.0-rc1",
3388
"revision": "32.1.0-rc1"
3389
},
3390
+
"33.0.0": {
3391
"archives": [
3392
{
3393
"os": "linux",
3394
+
"sha1": "c561971600d4ce682b128b0bd5d4ab71c5f2ad35",
3395
+
"size": 56000182,
3396
+
"url": "https://dl.google.com/android/repository/build-tools_r33-linux.zip"
3397
},
3398
{
3399
"os": "macosx",
3400
+
"sha1": "3693851532ba9640710d2dd360d85aa5b04c5151",
3401
+
"size": 60023096,
3402
+
"url": "https://dl.google.com/android/repository/build-tools_r33-macosx.zip"
3403
+
},
3404
+
{
3405
+
"os": "windows",
3406
+
"sha1": "f4ef853e5e755ea5ffc50de73a9e420fc76c662e",
3407
+
"size": 55610532,
3408
+
"url": "https://dl.google.com/android/repository/build-tools_r33-windows.zip"
3409
}
3410
],
3411
+
"displayName": "Android SDK Build-Tools 33",
3412
+
"license": "android-sdk-license",
3413
"name": "build-tools",
3414
+
"path": "build-tools/33.0.0",
3415
+
"revision": "33.0.0"
3416
}
3417
},
3418
"cmake": {
···
3714
"name": "cmdline-tools",
3715
"path": "cmdline-tools/6.0",
3716
"revision": "6.0"
3717
+
},
3718
+
"7.0": {
3719
+
"archives": [
3720
+
{
3721
+
"os": "linux",
3722
+
"sha1": "5e7bf2dd563d34917d32f3c5920a85562a795c93",
3723
+
"size": 114168525,
3724
+
"url": "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip"
3725
+
},
3726
+
{
3727
+
"os": "macosx",
3728
+
"sha1": "9a663c49dbd3709fc2b7d49db2814b383d811b4a",
3729
+
"size": 114168511,
3730
+
"url": "https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip"
3731
+
},
3732
+
{
3733
+
"os": "windows",
3734
+
"sha1": "1bdd32ac4b9fffea04f5bc341108e8b4fea6f32c",
3735
+
"size": 114147385,
3736
+
"url": "https://dl.google.com/android/repository/commandlinetools-win-8512546_latest.zip"
3737
+
}
3738
+
],
3739
+
"displayName": "Android SDK Command-line Tools",
3740
+
"license": "android-sdk-license",
3741
+
"name": "cmdline-tools",
3742
+
"path": "cmdline-tools/7.0",
3743
+
"revision": "7.0"
3744
}
3745
},
3746
"emulator": {
3747
+
"31.2.10": {
3748
"archives": [
3749
{
3750
"os": "linux",
3751
+
"sha1": "1f2c3ddeb2c9ac4feef5946098a0a710d08e9c6d",
3752
+
"size": 276337904,
3753
+
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8420304.zip"
3754
},
3755
{
3756
"os": "windows",
3757
+
"sha1": "206491b5c4e531b2c66dc80402702b9fa1a64c2a",
3758
+
"size": 345300871,
3759
+
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8420304.zip"
3760
},
3761
{
3762
"os": "macosx",
3763
+
"sha1": "677b6a00c145eb8bf4306daeb2231c8efd507177",
3764
+
"size": 313876814,
3765
+
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8420304.zip"
3766
}
3767
],
3768
"displayName": "Android Emulator",
3769
"license": "android-sdk-license",
3770
"name": "emulator",
3771
"path": "emulator",
3772
+
"revision": "31.2.10"
3773
},
3774
+
"31.3.8": {
3775
"archives": [
3776
{
3777
"os": "macosx",
3778
+
"sha1": "7214e8384c97a7c9875142149d3bf9c940e9b5a0",
3779
+
"size": 347222379,
3780
+
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8598121.zip"
3781
},
3782
{
3783
"os": "linux",
3784
+
"sha1": "0f781977a6cc5377b64444121ff75a513841a4fa",
3785
+
"size": 293782881,
3786
+
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8598121.zip"
3787
},
3788
{
3789
"os": "windows",
3790
+
"sha1": "b4f30bad4e68da41cc9bd44965259b2111a011a1",
3791
+
"size": 380151866,
3792
+
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8598121.zip"
3793
}
3794
],
3795
"displayName": "Android Emulator",
3796
"license": "android-sdk-preview-license",
3797
"name": "emulator",
3798
"path": "emulator",
3799
+
"revision": "31.3.8"
3800
+
},
3801
+
"31.3.9": {
3802
+
"archives": [
3803
+
{
3804
+
"os": "macosx",
3805
+
"sha1": "6e7b549113252728cfe0992d58e8cb1790dce9d6",
3806
+
"size": 347241742,
3807
+
"url": "https://dl.google.com/android/repository/emulator-darwin_x64-8700579.zip"
3808
+
},
3809
+
{
3810
+
"os": "linux",
3811
+
"sha1": "1c1a7ef65476d3de34f19455a0093cb68e8e90f7",
3812
+
"size": 293801439,
3813
+
"url": "https://dl.google.com/android/repository/emulator-linux_x64-8700579.zip"
3814
+
},
3815
+
{
3816
+
"os": "windows",
3817
+
"sha1": "ea834211b199a7fcf6b6758a53c4594d01b44ab9",
3818
+
"size": 380168712,
3819
+
"url": "https://dl.google.com/android/repository/emulator-windows_x64-8700579.zip"
3820
+
}
3821
+
],
3822
+
"displayName": "Android Emulator",
3823
+
"license": "android-sdk-license",
3824
+
"name": "emulator",
3825
+
"path": "emulator",
3826
+
"revision": "31.3.9"
3827
}
3828
},
3829
"extras": {
···
4666
"path": "ndk/23.1.7779620",
4667
"revision": "23.1.7779620"
4668
},
4669
+
"23.2.8568313": {
4670
+
"archives": [
4671
+
{
4672
+
"os": "macosx",
4673
+
"sha1": "1fc65d8f6083f3f5cd01e0cf97c6adc10f4f076f",
4674
+
"size": 982917530,
4675
+
"url": "https://dl.google.com/android/repository/android-ndk-r23c-darwin.zip"
4676
+
},
4677
+
{
4678
+
"os": "linux",
4679
+
"sha1": "e5053c126a47e84726d9f7173a04686a71f9a67a",
4680
+
"size": 724733960,
4681
+
"url": "https://dl.google.com/android/repository/android-ndk-r23c-linux.zip"
4682
+
},
4683
+
{
4684
+
"os": "windows",
4685
+
"sha1": "f2c5def76a9de371f27d028864fe301ab4fe0cf8",
4686
+
"size": 788336993,
4687
+
"url": "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip"
4688
+
}
4689
+
],
4690
+
"displayName": "NDK (Side by side) 23.2.8568313",
4691
+
"license": "android-sdk-license",
4692
+
"name": "ndk",
4693
+
"path": "ndk/23.2.8568313",
4694
+
"revision": "23.2.8568313"
4695
+
},
4696
"24.0.7856742-rc1": {
4697
"archives": [
4698
{
···
4854
"name": "ndk",
4855
"path": "ndk/25.0.8221429",
4856
"revision": "25.0.8221429-rc2"
4857
+
},
4858
+
"25.0.8355429-rc3": {
4859
+
"archives": [
4860
+
{
4861
+
"os": "macosx",
4862
+
"sha1": "224594abb41357c20cb4a9f4a732c484b2e743ba",
4863
+
"size": 748047157,
4864
+
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-darwin.zip"
4865
+
},
4866
+
{
4867
+
"os": "linux",
4868
+
"sha1": "79c8db05e20edde0cbb02d2326e7b8405f7eb977",
4869
+
"size": 510520692,
4870
+
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-linux.zip"
4871
+
},
4872
+
{
4873
+
"os": "windows",
4874
+
"sha1": "7d2c398045f6bbad03f6fb2f2ba419a2a48ab1e7",
4875
+
"size": 506142216,
4876
+
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-windows.zip"
4877
+
}
4878
+
],
4879
+
"displayName": "NDK (Side by side) 25.0.8355429",
4880
+
"license": "android-sdk-preview-license",
4881
+
"name": "ndk",
4882
+
"path": "ndk/25.0.8355429",
4883
+
"revision": "25.0.8355429-rc3"
4884
+
},
4885
+
"25.0.8528842-rc4": {
4886
+
"archives": [
4887
+
{
4888
+
"os": "macosx",
4889
+
"sha1": "d7f344ecc68518a8178d15b1b80e27bc5c69f00d",
4890
+
"size": 716633626,
4891
+
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-darwin.zip"
4892
+
},
4893
+
{
4894
+
"os": "linux",
4895
+
"sha1": "d13f688fd286709f0d950c75119ec9fcad8a47ff",
4896
+
"size": 531018178,
4897
+
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-linux.zip"
4898
+
},
4899
+
{
4900
+
"os": "windows",
4901
+
"sha1": "668b063c7c535c4f8be52c84acebb5779935203b",
4902
+
"size": 464031742,
4903
+
"url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-windows.zip"
4904
+
}
4905
+
],
4906
+
"displayName": "NDK (Side by side) 25.0.8528842",
4907
+
"license": "android-sdk-preview-license",
4908
+
"name": "ndk",
4909
+
"path": "ndk/25.0.8528842",
4910
+
"revision": "25.0.8528842-rc4"
4911
}
4912
},
4913
"ndk-bundle": {
···
5605
}
5606
},
5607
"platform-tools": {
5608
+
"33.0.2": {
5609
"archives": [
5610
{
5611
"os": "macosx",
5612
+
"sha1": "9b5661e0c18a2e5b6935e2b96bcc7be580cd6dcd",
5613
+
"size": 13038676,
5614
+
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-darwin.zip"
5615
},
5616
{
5617
"os": "linux",
5618
+
"sha1": "6bf4f747ad929b02378b44ce083b4502d26109c7",
5619
+
"size": 7406632,
5620
+
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-linux.zip"
5621
},
5622
{
5623
"os": "windows",
5624
+
"sha1": "2d7599f59b54f02c4ecd33d656091a3c1e55ad9c",
5625
+
"size": 6304111,
5626
+
"url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-windows.zip"
5627
}
5628
],
5629
"displayName": "Android SDK Platform-Tools",
5630
"license": "android-sdk-license",
5631
"name": "platform-tools",
5632
"path": "platform-tools",
5633
+
"revision": "33.0.2"
5634
}
5635
},
5636
"platforms": {
···
6033
"path": "platforms/android-32",
6034
"revision": "32"
6035
},
6036
+
"33": {
6037
+
"archives": [
6038
+
{
6039
+
"os": "all",
6040
+
"sha1": "298f5800e37f3c089ab0eb58d4f6aef4058b689b",
6041
+
"size": 67324871,
6042
+
"url": "https://dl.google.com/android/repository/platform-33_r01.zip"
6043
+
}
6044
+
],
6045
+
"displayName": "Android SDK Platform 33",
6046
+
"license": "android-sdk-license",
6047
+
"name": "platforms",
6048
+
"path": "platforms/android-33",
6049
+
"revision": "33"
6050
+
},
6051
"4": {
6052
"archives": [
6053
{
···
6174
"path": "platforms/android-9",
6175
"revision": "9"
6176
},
6177
+
"TiramisuPrivacySandbox": {
6178
"archives": [
6179
{
6180
"os": "all",
6181
+
"sha1": "8dd74a564f71c8381f5230682c5da291d230cc81",
6182
+
"size": 67918949,
6183
+
"url": "https://dl.google.com/android/repository/platform-TiramisuPrivacySandbox_r03.zip"
6184
}
6185
],
6186
+
"displayName": "Android SDK Platform TiramisuPrivacySandbox",
6187
"license": "android-sdk-license",
6188
"name": "platforms",
6189
+
"path": "platforms/android-TiramisuPrivacySandbox",
6190
+
"revision": "TiramisuPrivacySandbox"
6191
}
6192
},
6193
"skiaparser": {
···
6543
"name": "sources",
6544
"path": "sources/android-31",
6545
"revision": "31"
6546
+
},
6547
+
"32": {
6548
+
"archives": [
6549
+
{
6550
+
"os": "all",
6551
+
"sha1": "d7195c6de611b99d7ec3565eabe2fd21268b7f98",
6552
+
"size": 46933291,
6553
+
"url": "https://dl.google.com/android/repository/sources-32_r01.zip"
6554
+
}
6555
+
],
6556
+
"displayName": "Sources for Android 32",
6557
+
"license": "android-sdk-license",
6558
+
"name": "sources",
6559
+
"path": "sources/android-32",
6560
+
"revision": "32"
6561
}
6562
},
6563
"tools": {
+20
pkgs/development/ocaml-modules/chrome-trace/default.nix
+20
pkgs/development/ocaml-modules/chrome-trace/default.nix
···
···
1
+
{ lib, buildDunePackage, dune_3 }:
2
+
3
+
buildDunePackage rec {
4
+
pname = "chrome-trace";
5
+
inherit (dune_3) src version;
6
+
7
+
duneVersion = "3";
8
+
9
+
dontAddPrefix = true;
10
+
11
+
preBuild = ''
12
+
rm -r vendor/csexp
13
+
'';
14
+
15
+
meta = with lib; {
16
+
description = "Chrome trace event generation library";
17
+
inherit (dune_3.meta) homepage;
18
+
license = licenses.mit;
19
+
};
20
+
}
+6
-8
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+6
-8
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
···
1
{ lib, fetchFromGitHub, buildDunePackage, ocaml
2
, cryptokit, ocamlnet, ocurl, yojson
3
-
, ounit
4
}:
5
6
buildDunePackage rec {
7
pname = "gapi-ocaml";
8
-
version = "0.4.2";
9
10
-
useDune2 = true;
11
-
12
-
minimumOCamlVersion = "4.02";
13
14
src = fetchFromGitHub {
15
owner = "astrada";
16
repo = pname;
17
rev = "v${version}";
18
-
sha256 = "sha256-imicHOlNjPHHW/lcWRJmURafYZFe/6J3efKPJcel8J8=";
19
};
20
21
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
22
23
doCheck = lib.versionAtLeast ocaml.version "4.04";
24
-
checkInputs = [ ounit ];
25
26
meta = {
27
description = "OCaml client for google services";
28
-
homepage = "http://gapi-ocaml.forge.ocamlcore.org";
29
license = lib.licenses.mit;
30
maintainers = with lib.maintainers; [ bennofs ];
31
};
···
1
{ lib, fetchFromGitHub, buildDunePackage, ocaml
2
, cryptokit, ocamlnet, ocurl, yojson
3
+
, ounit2
4
}:
5
6
buildDunePackage rec {
7
pname = "gapi-ocaml";
8
+
version = "0.4.3";
9
10
+
minimalOCamlVersion = "4.02";
11
12
src = fetchFromGitHub {
13
owner = "astrada";
14
repo = pname;
15
rev = "v${version}";
16
+
sha256 = "sha256-V0GB9Bd06IdcI5PDFHGVZ0Y/qi7tTs/4ITqPXUOxCLs=";
17
};
18
19
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
20
21
doCheck = lib.versionAtLeast ocaml.version "4.04";
22
+
checkInputs = [ ounit2 ];
23
24
meta = {
25
description = "OCaml client for google services";
26
+
inherit (src.meta) homepage;
27
license = lib.licenses.mit;
28
maintainers = with lib.maintainers; [ bennofs ];
29
};
+7
-3
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+7
-3
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
···
12
let params =
13
if lib.versionAtLeast ocaml.version "4.14"
14
then {
15
-
version = "1.11.3";
16
-
sha256 = "sha256-KlMFh05O04I0Xil2B+nL2hUxZw0jaDMUnI23oUwGyhs=";
17
} else if lib.versionAtLeast ocaml.version "4.13"
18
then {
19
version = "1.10.5";
20
sha256 = "sha256-TeJS6t1ruWhWPvWNatrnSUWI6T17XKiosHLYizBDDcw=";
21
} else if lib.versionAtLeast ocaml.version "4.12"
22
then {
23
version = "1.9.0";
24
sha256 = "sha256:1ac44n6g3rf84gvhcca545avgf9vpkwkkkm0s8ipshfhp4g4jikh";
25
} else {
26
version = "1.4.1";
27
sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
28
}
···
32
pname = "jsonrpc";
33
inherit (params) version;
34
src = fetchurl {
35
-
url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
36
inherit (params) sha256;
37
};
38
···
12
let params =
13
if lib.versionAtLeast ocaml.version "4.14"
14
then {
15
+
name = "lsp";
16
+
version = "1.12.4";
17
+
sha256 = "sha256-kZuYAny8VjWdq+ipEdPSTRcGzqjNBOgXOi0dOwb52EY=";
18
} else if lib.versionAtLeast ocaml.version "4.13"
19
then {
20
+
name = "jsonrpc";
21
version = "1.10.5";
22
sha256 = "sha256-TeJS6t1ruWhWPvWNatrnSUWI6T17XKiosHLYizBDDcw=";
23
} else if lib.versionAtLeast ocaml.version "4.12"
24
then {
25
+
name = "jsonrpc";
26
version = "1.9.0";
27
sha256 = "sha256:1ac44n6g3rf84gvhcca545avgf9vpkwkkkm0s8ipshfhp4g4jikh";
28
} else {
29
+
name = "jsonrpc";
30
version = "1.4.1";
31
sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f";
32
}
···
36
pname = "jsonrpc";
37
inherit (params) version;
38
src = fetchurl {
39
+
url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/${params.name}-${version}.tbz";
40
inherit (params) sha256;
41
};
42
+17
-1
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+17
-1
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
···
13
, dyn
14
, re
15
, stdune
16
+
, chrome-trace
17
, dune_3
18
, csexp
19
, pp
···
41
'';
42
43
buildInputs =
44
+
if lib.versionAtLeast version "1.12.0" then
45
+
[
46
+
pp
47
+
re
48
+
ppx_yojson_conv_lib
49
+
octavius
50
+
dune-build-info
51
+
dune-rpc
52
+
omd
53
+
cmdliner
54
+
ocamlformat-rpc-lib
55
+
dyn
56
+
stdune
57
+
chrome-trace
58
+
]
59
+
else if lib.versionAtLeast version "1.10.0" then
60
[
61
pp
62
re
-39
pkgs/development/python-modules/django-sampledatahelper/default.nix
-39
pkgs/development/python-modules/django-sampledatahelper/default.nix
···
1
-
{ lib
2
-
, buildPythonPackage
3
-
, fetchFromGitHub
4
-
, versiontools
5
-
, django
6
-
, sampledata
7
-
, nose
8
-
, pillow
9
-
, six
10
-
}:
11
-
12
-
buildPythonPackage rec {
13
-
pname = "django-sampledatahelper";
14
-
version = "0.5";
15
-
16
-
# no tests on PyPI
17
-
src = fetchFromGitHub {
18
-
owner = "kaleidos";
19
-
repo = "django-sampledatahelper";
20
-
rev = "8576f352ec26a3650f4386a6e1285b723f6aec23"; # no tag
21
-
sha256 = "1fx3ql4b9791594zkary19n20x5ra1m1n3pjaya9di1qy64csac4";
22
-
};
23
-
24
-
nativeBuildInputs = [ versiontools ];
25
-
26
-
propagatedBuildInputs = [ django sampledata ];
27
-
28
-
checkInputs = [ nose pillow six ];
29
-
30
-
checkPhase = ''
31
-
DJANGO_SETTINGS_MODULE=tests.settings NOSE_EXCLUDE=test_calling_command nosetests -v
32
-
'';
33
-
34
-
meta = {
35
-
description = "Helper class for generate sample data for django apps development";
36
-
homepage = "https://github.com/kaleidos/django-sampledatahelper";
37
-
license = lib.licenses.bsd3;
38
-
};
39
-
}
···
+18
-20
pkgs/development/python-modules/optax/default.nix
+18
-20
pkgs/development/python-modules/optax/default.nix
···
1
{ absl-py
2
, buildPythonPackage
3
, chex
4
-
, dm-haiku
5
, fetchFromGitHub
6
, jaxlib
7
, lib
8
, numpy
9
-
, pytest-xdist
10
-
, pytestCheckHook
11
-
, tensorflow
12
-
, tensorflow-datasets
13
}:
14
15
buildPythonPackage rec {
16
pname = "optax";
17
-
version = "0.1.1";
18
19
src = fetchFromGitHub {
20
owner = "deepmind";
21
repo = pname;
22
rev = "v${version}";
23
-
hash = "sha256-s/BcqzhdfWzR61MStusUPQtuT4+t8NcC5gBGiGggFqw=";
24
};
25
26
buildInputs = [ jaxlib ];
27
28
propagatedBuildInputs = [
···
31
numpy
32
];
33
34
-
checkInputs = [
35
-
dm-haiku
36
-
pytest-xdist
37
-
pytestCheckHook
38
-
tensorflow
39
-
tensorflow-datasets
40
-
];
41
42
pythonImportsCheck = [
43
"optax"
44
];
45
46
-
disabledTestPaths = [
47
-
# Requires `flax` which depends on `optax` creating circular dependency.
48
-
"optax/_src/equivalence_test.py"
49
-
# See https://github.com/deepmind/optax/issues/323.
50
-
"examples/lookahead_mnist_test.py"
51
-
];
52
53
meta = with lib; {
54
description = "Optax is a gradient processing and optimization library for JAX.";
···
1
{ absl-py
2
, buildPythonPackage
3
, chex
4
, fetchFromGitHub
5
, jaxlib
6
, lib
7
, numpy
8
+
, callPackage
9
}:
10
11
buildPythonPackage rec {
12
pname = "optax";
13
+
version = "0.1.3";
14
15
src = fetchFromGitHub {
16
owner = "deepmind";
17
repo = pname;
18
rev = "v${version}";
19
+
hash = "sha256-XAYztMBQpLBHNuNED/iodbwIMJSN/0GxdmTGQ5jD9Ws=";
20
};
21
22
+
outputs = [
23
+
"out"
24
+
"testsout"
25
+
];
26
+
27
buildInputs = [ jaxlib ];
28
29
propagatedBuildInputs = [
···
32
numpy
33
];
34
35
+
postInstall = ''
36
+
mkdir $testsout
37
+
cp -R examples $testsout/examples
38
+
'';
39
40
pythonImportsCheck = [
41
"optax"
42
];
43
44
+
# check in passthru.tests.pytest to escape infinite recursion with flax
45
+
doCheck = false;
46
+
47
+
passthru.tests = {
48
+
pytest = callPackage ./tests.nix { };
49
+
};
50
51
meta = with lib; {
52
description = "Optax is a gradient processing and optimization library for JAX.";
+35
pkgs/development/python-modules/optax/tests.nix
+35
pkgs/development/python-modules/optax/tests.nix
···
···
1
+
{ stdenv
2
+
, buildPythonPackage
3
+
, dm-haiku
4
+
, pytest-xdist
5
+
, pytestCheckHook
6
+
, tensorflow
7
+
, tensorflow-datasets
8
+
, flax
9
+
, optax
10
+
}:
11
+
12
+
buildPythonPackage rec {
13
+
pname = "optax-tests";
14
+
inherit (optax) version;
15
+
16
+
src = optax.testsout;
17
+
18
+
dontBuild = true;
19
+
dontInstall = true;
20
+
21
+
checkInputs = [
22
+
dm-haiku
23
+
pytest-xdist
24
+
pytestCheckHook
25
+
tensorflow
26
+
tensorflow-datasets
27
+
flax
28
+
];
29
+
30
+
disabledTestPaths = [
31
+
# See https://github.com/deepmind/optax/issues/323
32
+
"examples/lookahead_mnist_test.py"
33
+
];
34
+
35
+
}
+4
pkgs/development/python-modules/plotnine/default.nix
+4
pkgs/development/python-modules/plotnine/default.nix
+45
pkgs/development/python-modules/scikit-misc/default.nix
+45
pkgs/development/python-modules/scikit-misc/default.nix
···
···
1
+
{ lib
2
+
, fetchPypi
3
+
, buildPythonPackage
4
+
, cython
5
+
, gfortran
6
+
, pytestCheckHook
7
+
, numpy }:
8
+
9
+
buildPythonPackage rec {
10
+
pname = "scikit-misc";
11
+
version = "0.1.4";
12
+
13
+
src = fetchPypi {
14
+
inherit pname version;
15
+
sha256 = "sha256-93RqA0eBEGPh7PkSHflINXhQA5U8OLW6hPY/xQjCKRE=";
16
+
};
17
+
18
+
postPatch = ''
19
+
substituteInPlace pytest.ini \
20
+
--replace "--cov --cov-report=xml" ""
21
+
'';
22
+
23
+
nativeBuildInputs = [
24
+
gfortran
25
+
];
26
+
27
+
buildInputs = [
28
+
cython
29
+
numpy
30
+
];
31
+
32
+
# Tests fail because of infinite recursion error
33
+
doCheck = false;
34
+
35
+
pythonImportsCheck = [
36
+
"skmisc"
37
+
];
38
+
39
+
meta = with lib; {
40
+
description = "Miscellaneous tools for scientific computing";
41
+
homepage = "https://github.com/has2k1/scikit-misc";
42
+
license = licenses.bsd3;
43
+
maintainers = with maintainers; [ onny ];
44
+
};
45
+
}
+25
pkgs/development/tools/ocaml/opam2json/default.nix
+25
pkgs/development/tools/ocaml/opam2json/default.nix
···
···
1
+
{ lib, stdenv, fetchFromGitHub, opam-installer, ocamlPackages }:
2
+
stdenv.mkDerivation rec {
3
+
pname = "opam2json";
4
+
version = "0.2";
5
+
6
+
src = fetchFromGitHub {
7
+
owner = "tweag";
8
+
repo = pname;
9
+
rev = "v${version}";
10
+
sha256 = "fe8bm/V/4r2iNxgbitT2sXBqDHQ0GBSnSUSBg/1aXoI=";
11
+
};
12
+
13
+
buildInputs = with ocamlPackages; [ yojson opam-file-format cmdliner ];
14
+
nativeBuildInputs = with ocamlPackages; [ ocaml findlib opam-installer ];
15
+
16
+
preInstall = ''export PREFIX="$out"'';
17
+
18
+
meta = with lib; {
19
+
platforms = platforms.all;
20
+
description = "convert opam file syntax to JSON";
21
+
maintainers = [ maintainers.balsoft ];
22
+
license = licenses.gpl3;
23
+
homepage = "https://github.com/tweag/opam2json";
24
+
};
25
+
}
+1
pkgs/development/tools/zls/default.nix
+1
pkgs/development/tools/zls/default.nix
+68
pkgs/os-specific/linux/adcli/default.nix
+68
pkgs/os-specific/linux/adcli/default.nix
···
···
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitLab
4
+
, fetchpatch
5
+
, openldap
6
+
, libkrb5
7
+
, libxslt
8
+
, autoreconfHook
9
+
, pkg-config
10
+
, cyrus_sasl
11
+
, util-linux
12
+
, xmlto
13
+
, docbook_xsl
14
+
, docbook_xml_dtd_43
15
+
}:
16
+
17
+
stdenv.mkDerivation rec {
18
+
pname = "adcli";
19
+
version = "0.9.1";
20
+
21
+
src = fetchFromGitLab {
22
+
domain = "gitlab.freedesktop.org";
23
+
owner = "realmd";
24
+
repo = pname;
25
+
rev = version;
26
+
sha256 = "sha256-Zzt4qgLiJNuSrbtDWuxJEfGL7sWSbqN301q3qXZpn9c=";
27
+
};
28
+
29
+
# https://bugs.gentoo.org/820224
30
+
# Without this it produces some weird missing symbol error in glibc
31
+
patches = [
32
+
(fetchpatch {
33
+
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch?id=01db544de893262e857685e11b33c2a74210181f";
34
+
sha256 = "sha256-dZ6dkzxd+0XjY/X9/2IWMan3syvCDGFHiMbxFxMHGFA=";
35
+
})
36
+
];
37
+
38
+
postPatch = ''
39
+
substituteInPlace tools/Makefile.am \
40
+
--replace 'sbin_PROGRAMS' 'bin_PROGRAMS'
41
+
42
+
substituteInPlace doc/Makefile.am \
43
+
--replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
44
+
'${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
45
+
46
+
function patch_docbook(){
47
+
substituteInPlace $1 \
48
+
--replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
49
+
"${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
50
+
}
51
+
patch_docbook doc/adcli.xml
52
+
patch_docbook doc/adcli-devel.xml
53
+
patch_docbook doc/adcli-docs.xml
54
+
'';
55
+
nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl ];
56
+
57
+
buildInputs = [ openldap libkrb5 libxslt cyrus_sasl util-linux xmlto docbook_xsl ];
58
+
59
+
configureFlags = [ "--disable-debug" ];
60
+
61
+
meta = with lib; {
62
+
homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html";
63
+
description = "A helper library and tools for Active Directory client operations.";
64
+
license = licenses.lgpl21Only;
65
+
maintainers = with maintainers; [ SohamG ];
66
+
platforms = platforms.linux;
67
+
};
68
+
}
+4
-6
pkgs/servers/atlassian/jira.nix
+4
-6
pkgs/servers/atlassian/jira.nix
···
3
, fetchurl
4
, gawk
5
, enableSSO ? false
6
-
, crowdProperties ? null
7
}:
8
9
stdenv.mkDerivation rec {
···
14
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
15
sha256 = "sha256-Zog0m8tsx8mDLU1rsW5zhhHgyRmi4JGWuy9DV8yp9nY=";
16
};
17
18
buildPhase = ''
19
mv conf/server.xml conf/server.xml.dist
···
27
substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
28
--replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \
29
com.atlassian.jira.security.login.SSOSeraphAuthenticator
30
-
'' + lib.optionalString (crowdProperties != null) ''
31
-
cat <<EOF > atlassian-jira/WEB-INF/classes/crowd.properties
32
-
${crowdProperties}
33
-
EOF
34
'';
35
36
installPhase = ''
···
41
description = "Proprietary issue tracking product, also providing project management functions";
42
homepage = "https://www.atlassian.com/software/jira";
43
license = licenses.unfree;
44
-
maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ];
45
};
46
}
···
3
, fetchurl
4
, gawk
5
, enableSSO ? false
6
+
, makeWrapper
7
}:
8
9
stdenv.mkDerivation rec {
···
14
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
15
sha256 = "sha256-Zog0m8tsx8mDLU1rsW5zhhHgyRmi4JGWuy9DV8yp9nY=";
16
};
17
+
18
+
nativeBuildInputs = [ makeWrapper ];
19
20
buildPhase = ''
21
mv conf/server.xml conf/server.xml.dist
···
29
substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
30
--replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \
31
com.atlassian.jira.security.login.SSOSeraphAuthenticator
32
'';
33
34
installPhase = ''
···
39
description = "Proprietary issue tracking product, also providing project management functions";
40
homepage = "https://www.atlassian.com/software/jira";
41
license = licenses.unfree;
42
+
maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ma27 ];
43
};
44
}
+3
-3
pkgs/servers/etcd/3.4.nix
+3
-3
pkgs/servers/etcd/3.4.nix
···
2
3
buildGoModule rec {
4
pname = "etcd";
5
+
version = "3.4.19";
6
7
+
vendorSha256 = "sha256-ZONIsizxRiwZWRu4y9VzZcCpyBKoa0j3h3JqoMMPGu0=";
8
9
doCheck = false;
10
···
12
owner = "etcd-io";
13
repo = "etcd";
14
rev = "v${version}";
15
+
sha256 = "sha256-8X7xTZrZ/AjUgrW9XgD8B7eKFfOulj8WBjXoImAtJoM=";
16
};
17
18
buildPhase = ''
+4
-2
pkgs/servers/mail/rspamd/default.nix
+4
-2
pkgs/servers/mail/rspamd/default.nix
···
1
{ stdenv, lib, fetchFromGitHub, cmake, perl
2
-
, glib, luajit, openssl, pcre2, pkg-config, sqlite, ragel, icu
3
, hyperscan, jemalloc, blas, lapack, lua, libsodium
4
, withBlas ? true
5
, withHyperscan ? stdenv.isx86_64
···
23
hardeningEnable = [ "pie" ];
24
25
nativeBuildInputs = [ cmake pkg-config perl ];
26
-
buildInputs = [ glib openssl pcre2 sqlite ragel icu jemalloc libsodium ]
27
++ lib.optional withHyperscan hyperscan
28
++ lib.optionals withBlas [ blas lapack ]
29
++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;
30
31
cmakeFlags = [
32
"-DDEBIAN_BUILD=ON"
33
"-DRUNDIR=/run/rspamd"
34
"-DDBDIR=/var/lib/rspamd"
···
1
{ stdenv, lib, fetchFromGitHub, cmake, perl
2
+
, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu
3
, hyperscan, jemalloc, blas, lapack, lua, libsodium
4
, withBlas ? true
5
, withHyperscan ? stdenv.isx86_64
···
23
hardeningEnable = [ "pie" ];
24
25
nativeBuildInputs = [ cmake pkg-config perl ];
26
+
buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ]
27
++ lib.optional withHyperscan hyperscan
28
++ lib.optionals withBlas [ blas lapack ]
29
++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;
30
31
cmakeFlags = [
32
+
# pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
33
+
"-DENABLE_PCRE2=OFF"
34
"-DDEBIAN_BUILD=ON"
35
"-DRUNDIR=/run/rspamd"
36
"-DDBDIR=/var/lib/rspamd"
+30
pkgs/shells/bash/fzf-obc/default.nix
+30
pkgs/shells/bash/fzf-obc/default.nix
···
···
1
+
{ lib, stdenv, fetchFromGitHub }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "fzf-obc";
5
+
version = "1.3.0";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "rockandska";
9
+
repo = pname;
10
+
rev = version;
11
+
sha256 = "sha256-KIAlDpt1Udl+RLp3728utgQ9FCjZz/OyoG92MOJmgPI=";
12
+
};
13
+
14
+
dontBuild = true;
15
+
16
+
installPhase = ''
17
+
mkdir -p $out/share/fzf-obc/{bin,lib/fzf-obc,plugins/{kill,gradle}}
18
+
install -m644 bin/* $out/share/fzf-obc/bin
19
+
install -m644 lib/fzf-obc/* $out/share/fzf-obc/lib/fzf-obc
20
+
install -m644 plugins/kill/* $out/share/fzf-obc/plugins/kill
21
+
install -m644 plugins/gradle/* $out/share/fzf-obc/plugins/gradle
22
+
'';
23
+
24
+
meta = with lib; {
25
+
homepage = "https://fzf-obc.readthedocs.io";
26
+
description = "Completion script adding fzf over all know bash completion functions";
27
+
license = licenses.unfree;
28
+
maintainers = with maintainers; [ loicreynier ];
29
+
};
30
+
}
+2
-2
pkgs/tools/misc/yt-dlp/default.nix
+2
-2
pkgs/tools/misc/yt-dlp/default.nix
···
20
# The websites yt-dlp deals with are a very moving target. That means that
21
# downloads break constantly. Because of that, updates should always be backported
22
# to the latest stable release.
23
-
version = "2022.6.29";
24
25
src = fetchPypi {
26
inherit pname;
27
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
28
-
sha256 = "sha256-X7+scv0DXRG8JpPl0c1pM7G8BxL3QvUIKiYXA4ELtck=";
29
};
30
31
propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];
···
20
# The websites yt-dlp deals with are a very moving target. That means that
21
# downloads break constantly. Because of that, updates should always be backported
22
# to the latest stable release.
23
+
version = "2022.07.18";
24
25
src = fetchPypi {
26
inherit pname;
27
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
28
+
sha256 = "sha256-DnuB/GrI0bfT//p5+QRMpBY3hEIlgsmjWTMF2ipp7AI=";
29
};
30
31
propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];
+11
-2
pkgs/top-level/all-packages.nix
+11
-2
pkgs/top-level/all-packages.nix
···
214
215
quickemu = callPackage ../development/quickemu { };
216
217
aether = callPackage ../applications/networking/aether { };
218
219
alda = callPackage ../development/interpreters/alda { };
···
2672
pkgs_i686 = pkgsi686Linux;
2673
};
2674
2675
-
androidndkPkgs = androidndkPkgs_18b;
2676
-
androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b";
2677
androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";
2678
2679
androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;
2680
···
3746
3747
fzf = callPackage ../tools/misc/fzf { };
3748
3749
fzf-zsh = callPackage ../shells/zsh/fzf-zsh { };
3750
3751
fzy = callPackage ../tools/misc/fzy { };
···
9186
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
9187
openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
9188
9189
openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
9190
9191
opencc = callPackage ../tools/text/opencc { };
···
13946
};
13947
13948
opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };
13949
13950
wrapWatcom = callPackage ../development/compilers/open-watcom/wrapper.nix { };
13951
open-watcom-v2-unwrapped = callPackage ../development/compilers/open-watcom/v2.nix { };
···
214
215
quickemu = callPackage ../development/quickemu { };
216
217
+
adcli = callPackage ../os-specific/linux/adcli { };
218
+
219
aether = callPackage ../applications/networking/aether { };
220
221
alda = callPackage ../development/interpreters/alda { };
···
2674
pkgs_i686 = pkgsi686Linux;
2675
};
2676
2677
+
androidndkPkgs = androidndkPkgs_21;
2678
androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";
2679
+
androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b";
2680
+
androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24";
2681
2682
androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;
2683
···
3749
3750
fzf = callPackage ../tools/misc/fzf { };
3751
3752
+
fzf-obc = callPackage ../shells/bash/fzf-obc { };
3753
+
3754
fzf-zsh = callPackage ../shells/zsh/fzf-zsh { };
3755
3756
fzy = callPackage ../tools/misc/fzy { };
···
9191
openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
9192
openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; };
9193
9194
+
openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { };
9195
+
9196
openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
9197
9198
opencc = callPackage ../tools/text/opencc { };
···
13953
};
13954
13955
opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };
13956
+
13957
+
opam2json = callPackage ../development/tools/ocaml/opam2json { };
13958
13959
wrapWatcom = callPackage ../development/compilers/open-watcom/wrapper.nix { };
13960
open-watcom-v2-unwrapped = callPackage ../development/compilers/open-watcom/v2.nix { };
+3
-1
pkgs/top-level/ocaml-packages.nix
+3
-1
pkgs/top-level/ocaml-packages.nix
···
181
182
checkseum = callPackage ../development/ocaml-modules/checkseum { };
183
184
cil = callPackage ../development/ocaml-modules/cil { };
185
186
cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1_0.nix { };
···
549
550
dypgen = callPackage ../development/ocaml-modules/dypgen { };
551
552
-
gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
553
554
gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { };
555
···
181
182
checkseum = callPackage ../development/ocaml-modules/checkseum { };
183
184
+
chrome-trace = callPackage ../development/ocaml-modules/chrome-trace { };
185
+
186
cil = callPackage ../development/ocaml-modules/cil { };
187
188
cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1_0.nix { };
···
551
552
dypgen = callPackage ../development/ocaml-modules/dypgen { };
553
554
+
gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
555
556
gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { };
557
+1
pkgs/top-level/python-aliases.nix
+1
pkgs/top-level/python-aliases.nix
···
55
diff_cover = diff-cover; # added 2021-07-02
56
discogs_client = discogs-client; # added 2021-07-02
57
djangorestframework-jwt = drf-jwt; # added 2021-07-20
58
django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
59
django_appconf = django-appconf; # added 2022-03-03
60
django_environ = django-environ; # added 2021-12-25
···
55
diff_cover = diff-cover; # added 2021-07-02
56
discogs_client = discogs-client; # added 2021-07-02
57
djangorestframework-jwt = drf-jwt; # added 2021-07-20
58
+
django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18
59
django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
60
django_appconf = django-appconf; # added 2022-03-03
61
django_environ = django-environ; # added 2021-12-25
+2
-2
pkgs/top-level/python-packages.nix
+2
-2
pkgs/top-level/python-packages.nix
···
2471
2472
django-reversion = callPackage ../development/python-modules/django-reversion { };
2473
2474
-
django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };
2475
-
2476
django-sesame = callPackage ../development/python-modules/django-sesame { };
2477
2478
django_silk = callPackage ../development/python-modules/django_silk { };
···
9576
};
9577
9578
scikit-learn-extra = callPackage ../development/python-modules/scikit-learn-extra { };
9579
9580
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
9581
···
2471
2472
django-reversion = callPackage ../development/python-modules/django-reversion { };
2473
2474
django-sesame = callPackage ../development/python-modules/django-sesame { };
2475
2476
django_silk = callPackage ../development/python-modules/django_silk { };
···
9574
};
9575
9576
scikit-learn-extra = callPackage ../development/python-modules/scikit-learn-extra { };
9577
+
9578
+
scikit-misc = callPackage ../development/python-modules/scikit-misc { };
9579
9580
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
9581