pyrox.dev
Merge master into staging-next
authored by github-actions[bot] and committed by GitHub 6f3dcdff 9968240f
-2
.github/CODEOWNERS
-2
.github/CODEOWNERS
+2
-2
nixos/modules/virtualisation/libvirtd.nix
+2
-2
nixos/modules/virtualisation/libvirtd.nix
···
282
setuid = true;
283
owner = "root";
284
group = "root";
285
-
source = "/run/${dirName}/nix-helpers/qemu-bridge-helper";
286
};
287
288
systemd.packages = [ cfg.package ];
···
308
ln -s --force "$emulator" /run/${dirName}/nix-emulators/
309
done
310
311
-
for helper in libexec/qemu-bridge-helper bin/qemu-pr-helper; do
312
ln -s --force ${cfg.qemu.package}/$helper /run/${dirName}/nix-helpers/
313
done
314
···
282
setuid = true;
283
owner = "root";
284
group = "root";
285
+
source = "${cfg.qemu.package}/libexec/qemu-bridge-helper";
286
};
287
288
systemd.packages = [ cfg.package ];
···
308
ln -s --force "$emulator" /run/${dirName}/nix-emulators/
309
done
310
311
+
for helper in bin/qemu-pr-helper; do
312
ln -s --force ${cfg.qemu.package}/$helper /run/${dirName}/nix-helpers/
313
done
314
+13
-15
nixos/modules/virtualisation/proxmox-image.nix
+13
-15
nixos/modules/virtualisation/proxmox-image.nix
···
129
# Build qemu with PVE's patch that adds support for the VMA format
130
vma = pkgs.qemu_kvm.overrideAttrs ( super: rec {
131
132
-
# proxmox's VMA patch doesn't work with qemu 7.0 yet
133
-
version = "6.2.0";
134
-
src = pkgs.fetchurl {
135
-
url= "https://download.qemu.org/qemu-${version}.tar.xz";
136
-
hash = "sha256-aOFdjkWsVjJuC5pK+otJo9/oq6NIgiHQmMhGmLymW0U=";
137
-
};
138
-
139
-
patches = let
140
-
rev = "b37b17c286da3d32945fbee8ee4fd97a418a50db";
141
-
path = "debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch";
142
-
vma-patch = pkgs.fetchpatch {
143
-
url = "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;h=${rev};f=${path}";
144
-
hash = "sha256-siuDWDUnM9Zq0/L2Faww3ELAOUHhVIHu5RAQn6L4Atc=";
145
-
};
146
-
in [ vma-patch ];
147
148
buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
149
···
155
rm $diskImage
156
${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma"
157
mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/
158
'';
159
format = "raw";
160
inherit config lib pkgs;
···
129
# Build qemu with PVE's patch that adds support for the VMA format
130
vma = pkgs.qemu_kvm.overrideAttrs ( super: rec {
131
132
+
patches = [
133
+
(pkgs.fetchpatch {
134
+
url =
135
+
let
136
+
rev = "1976ca460796f28447b41e3618e5c1e234035dd5";
137
+
path = "debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch";
138
+
in "https://git.proxmox.com/?p=pve-qemu.git;a=blob_plain;hb=${rev};f=${path}";
139
+
hash = "sha256-2Dz+ceTwrcyYYxi76RtyY3v15/2pwGcDhFuoZWlgbjc=";
140
+
})
141
+
];
142
143
buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
144
···
150
rm $diskImage
151
${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma"
152
mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/
153
+
154
+
mkdir -p $out/nix-support
155
+
echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" >> $out/nix-support/hydra-build-products
156
'';
157
format = "raw";
158
inherit config lib pkgs;
+1
nixos/tests/all-tests.nix
+1
nixos/tests/all-tests.nix
···
284
libreswan = handleTest ./libreswan.nix {};
285
librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; };
286
libuiohook = handleTest ./libuiohook.nix {};
287
lidarr = handleTest ./lidarr.nix {};
288
lightdm = handleTest ./lightdm.nix {};
289
lighttpd = handleTest ./lighttpd.nix {};
···
284
libreswan = handleTest ./libreswan.nix {};
285
librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; };
286
libuiohook = handleTest ./libuiohook.nix {};
287
+
libvirtd = handleTest ./libvirtd.nix {};
288
lidarr = handleTest ./lidarr.nix {};
289
lightdm = handleTest ./lightdm.nix {};
290
lighttpd = handleTest ./lighttpd.nix {};
+49
nixos/tests/libvirtd.nix
+49
nixos/tests/libvirtd.nix
···
···
1
+
import ./make-test-python.nix ({ pkgs, ... }: {
2
+
name = "libvirtd";
3
+
meta.maintainers = with pkgs.lib.maintainers; [ fpletz ];
4
+
5
+
nodes = {
6
+
virthost =
7
+
{ pkgs, ... }:
8
+
{
9
+
virtualisation = {
10
+
cores = 2;
11
+
memorySize = 2048;
12
+
13
+
libvirtd.enable = true;
14
+
};
15
+
networking.nameservers = [ "192.168.122.1" ];
16
+
security.polkit.enable = true;
17
+
environment.systemPackages = with pkgs; [ virt-manager ];
18
+
};
19
+
};
20
+
21
+
testScript = let
22
+
nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system};
23
+
virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy";
24
+
in ''
25
+
start_all()
26
+
27
+
virthost.wait_for_unit("sockets.target")
28
+
29
+
with subtest("enable default network"):
30
+
virthost.succeed("virsh net-start default")
31
+
virthost.succeed("virsh net-autostart default")
32
+
virthost.succeed("virsh net-info default")
33
+
34
+
with subtest("check if partition disk pools works with parted"):
35
+
virthost.succeed("fallocate -l100m /tmp/foo; losetup /dev/loop0 /tmp/foo; echo 'label: dos' | sfdisk /dev/loop0")
36
+
virthost.succeed("virsh pool-create-as foo disk --source-dev /dev/loop0 --target /dev")
37
+
virthost.succeed("virsh vol-create-as foo loop0p1 25MB")
38
+
virthost.succeed("virsh vol-create-as foo loop0p2 50MB")
39
+
40
+
with subtest("check if nixos install iso boots and network works"):
41
+
virthost.succeed(
42
+
"virt-install -n nixos --osinfo=nixos-unstable --ram=1024 --graphics=none --disk=`find ${nixosInstallISO}/iso -type f | head -n1`,readonly=on --import --noautoconsole"
43
+
)
44
+
virthost.succeed("virsh domstate nixos | grep running")
45
+
virthost.wait_until_succeeds("ping -c 1 nixos")
46
+
virthost.succeed("virsh ${virshShutdownCmd} nixos")
47
+
virthost.wait_until_succeeds("virsh domstate nixos | grep 'shut off'")
48
+
'';
49
+
})
+21
-6
pkgs/applications/audio/uade123/default.nix
pkgs/applications/audio/uade/default.nix
+21
-6
pkgs/applications/audio/uade123/default.nix
pkgs/applications/audio/uade/default.nix
···
6
, which
7
, makeWrapper
8
, libao
9
-
, libbencodetools
10
, sox
11
, lame
12
, flac
13
, vorbis-tools
14
}:
15
16
stdenv.mkDerivation rec {
17
-
pname = "uade123";
18
-
version = "3.01";
19
20
src = fetchFromGitLab {
21
owner = "uade-music-player";
22
repo = "uade";
23
rev = "uade-${version}";
24
-
sha256 = "0fam3g8mlzrirrac3iwcwsz9jmsqwdy7lkwwdr2q4pkq9cpmh8m5";
25
};
26
27
postPatch = ''
···
31
substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \
32
--replace '-e stat' '-n stat' \
33
--replace '/usr/local' "$out"
34
'';
35
36
nativeBuildInputs = [
37
pkg-config
38
which
39
makeWrapper
40
python3
41
];
42
43
buildInputs = [
44
libao
45
-
libbencodetools
46
sox
47
lame
48
flac
49
vorbis-tools
50
(python3.withPackages (p: with p; [
51
pillow
52
tqdm
53
]))
54
];
55
56
configureFlags = [
57
-
"--bencode-tools-prefix=${libbencodetools}"
58
];
59
60
enableParallelBuilding = true;
···
66
--prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]}
67
# This is an old script, don't break expectations by renaming it
68
ln -s $out/bin/mod2ogg2{.sh,}
69
wrapProgram $out/bin/generate_amiga_oscilloscope_view \
70
--prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
71
'';
···
79
# Let's make it easy and flag the whole package as unfree.
80
license = licenses.unfree;
81
maintainers = with maintainers; [ OPNA2608 ];
82
platforms = platforms.unix;
83
};
84
}
···
6
, which
7
, makeWrapper
8
, libao
9
+
, bencodetools
10
, sox
11
, lame
12
, flac
13
, vorbis-tools
14
+
# https://gitlab.com/uade-music-player/uade/-/issues/38
15
+
, withWriteAudio ? !stdenv.hostPlatform.isDarwin
16
}:
17
18
stdenv.mkDerivation rec {
19
+
pname = "uade";
20
+
version = "3.02";
21
22
src = fetchFromGitLab {
23
owner = "uade-music-player";
24
repo = "uade";
25
rev = "uade-${version}";
26
+
sha256 = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw=";
27
};
28
29
postPatch = ''
···
33
substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \
34
--replace '-e stat' '-n stat' \
35
--replace '/usr/local' "$out"
36
+
substituteInPlace python/uade/generate_oscilloscope_view.py \
37
+
--replace "default='uade123'" "default='$out/bin/uade123'"
38
+
# https://gitlab.com/uade-music-player/uade/-/issues/37
39
+
substituteInPlace write_audio/Makefile.in \
40
+
--replace 'g++' '${stdenv.cc.targetPrefix}c++'
41
'';
42
43
nativeBuildInputs = [
44
pkg-config
45
which
46
makeWrapper
47
+
] ++ lib.optionals withWriteAudio [
48
python3
49
];
50
51
buildInputs = [
52
libao
53
+
bencodetools
54
sox
55
lame
56
flac
57
vorbis-tools
58
+
] ++ lib.optionals withWriteAudio [
59
(python3.withPackages (p: with p; [
60
pillow
61
tqdm
62
+
more-itertools
63
]))
64
];
65
66
configureFlags = [
67
+
"--bencode-tools-prefix=${bencodetools}"
68
+
"--with-text-scope"
69
+
] ++ lib.optionals (!withWriteAudio) [
70
+
"--without-write-audio"
71
];
72
73
enableParallelBuilding = true;
···
79
--prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]}
80
# This is an old script, don't break expectations by renaming it
81
ln -s $out/bin/mod2ogg2{.sh,}
82
+
'' + lib.optionalString withWriteAudio ''
83
wrapProgram $out/bin/generate_amiga_oscilloscope_view \
84
--prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
85
'';
···
93
# Let's make it easy and flag the whole package as unfree.
94
license = licenses.unfree;
95
maintainers = with maintainers; [ OPNA2608 ];
96
+
mainProgram = "uade123";
97
platforms = platforms.unix;
98
};
99
}
+4
-4
pkgs/applications/networking/feedreaders/rssguard/default.nix
+4
-4
pkgs/applications/networking/feedreaders/rssguard/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook, wrapQtAppsHook }:
2
3
stdenv.mkDerivation rec {
4
pname = "rssguard";
5
-
version = "4.1.2";
6
7
src = fetchFromGitHub {
8
owner = "martinrotter";
9
repo = pname;
10
rev = version;
11
-
sha256 = "sha256-aG7Wkn2CHe7Dumskd0+DMja95lzvBWnFXACSqfU7Ow0=";
12
};
13
14
buildInputs = [ qtwebengine qttools ];
15
-
nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ];
16
qmakeFlags = [ "CONFIG+=release" ];
17
18
meta = with lib; {
···
1
+
{ lib, stdenv, fetchFromGitHub, cmake, qtwebengine, qttools, wrapGAppsHook, wrapQtAppsHook }:
2
3
stdenv.mkDerivation rec {
4
pname = "rssguard";
5
+
version = "4.2.3";
6
7
src = fetchFromGitHub {
8
owner = "martinrotter";
9
repo = pname;
10
rev = version;
11
+
sha256 = "sha256-s5SrQgu1PHNuuLeVKhLdFdLkxsPMFXGo09NBPe6/sv0=";
12
};
13
14
buildInputs = [ qtwebengine qttools ];
15
+
nativeBuildInputs = [ cmake wrapGAppsHook wrapQtAppsHook ];
16
qmakeFlags = [ "CONFIG+=release" ];
17
18
meta = with lib; {
-141
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
-141
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
···
1
-
{
2
-
"name": "element-desktop",
3
-
"productName": "Element",
4
-
"main": "lib/electron-main.js",
5
-
"version": "1.11.0",
6
-
"description": "A feature-rich client for Matrix.org",
7
-
"author": "Element",
8
-
"repository": {
9
-
"type": "git",
10
-
"url": "https://github.com/vector-im/element-desktop"
11
-
},
12
-
"license": "Apache-2.0",
13
-
"files": [],
14
-
"scripts": {
15
-
"i18n": "matrix-gen-i18n",
16
-
"prunei18n": "matrix-prune-i18n",
17
-
"diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
18
-
"mkdirs": "mkdirp packages deploys",
19
-
"fetch": "yarn run mkdirs && node scripts/fetch-package.js",
20
-
"asar-webapp": "asar p webapp webapp.asar",
21
-
"start": "yarn run build:ts && yarn run build:res && electron .",
22
-
"lint": "yarn lint:types && yarn lint:js",
23
-
"lint:js": "eslint --max-warnings 0 src scripts hak",
24
-
"lint:js-fix": "eslint --fix src scripts hak",
25
-
"lint:types": "tsc --noEmit && tsc -p scripts/hak/tsconfig.json --noEmit && tsc -p hak/tsconfig.json --noEmit",
26
-
"build:native": "yarn run hak",
27
-
"build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
28
-
"build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
29
-
"build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
30
-
"build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
31
-
"build": "yarn run build:ts && yarn run build:res && electron-builder",
32
-
"build:ts": "tsc",
33
-
"build:res": "node scripts/copy-res.js",
34
-
"docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
35
-
"docker:build:native": "scripts/in-docker.sh yarn run hak",
36
-
"docker:build": "scripts/in-docker.sh yarn run build",
37
-
"docker:install": "scripts/in-docker.sh yarn install",
38
-
"debrepo": "scripts/mkrepo.sh",
39
-
"clean": "rimraf webapp.asar dist packages deploys lib",
40
-
"hak": "ts-node scripts/hak/index.ts"
41
-
},
42
-
"dependencies": {
43
-
"auto-launch": "^5.0.5",
44
-
"counterpart": "^0.18.6",
45
-
"electron-store": "^6.0.1",
46
-
"electron-window-state": "^5.0.3",
47
-
"minimist": "^1.2.6",
48
-
"png-to-ico": "^2.1.1",
49
-
"request": "^2.88.2"
50
-
},
51
-
"devDependencies": {
52
-
"@types/auto-launch": "^5.0.1",
53
-
"@types/counterpart": "^0.18.1",
54
-
"@types/minimist": "^1.2.1",
55
-
"@types/mkdirp": "^1.0.2",
56
-
"@types/pacote": "^11.1.1",
57
-
"@types/rimraf": "^3.0.2",
58
-
"@typescript-eslint/eslint-plugin": "^5.6.0",
59
-
"@typescript-eslint/parser": "^5.6.0",
60
-
"allchange": "^1.0.6",
61
-
"app-builder-lib": "^22.14.10",
62
-
"asar": "^2.0.1",
63
-
"chokidar": "^3.5.2",
64
-
"detect-libc": "^1.0.3",
65
-
"electron": "^19",
66
-
"electron-builder": "22.11.4",
67
-
"electron-builder-squirrel-windows": "22.11.4",
68
-
"electron-devtools-installer": "^3.1.1",
69
-
"electron-notarize": "^1.0.0",
70
-
"eslint": "7.18.0",
71
-
"eslint-config-google": "^0.14.0",
72
-
"eslint-plugin-import": "^2.25.4",
73
-
"eslint-plugin-matrix-org": "^0.4.0",
74
-
"find-npm-prefix": "^1.0.2",
75
-
"fs-extra": "^8.1.0",
76
-
"glob": "^7.1.6",
77
-
"matrix-web-i18n": "^1.3.0",
78
-
"mkdirp": "^1.0.3",
79
-
"needle": "^2.5.0",
80
-
"node-pre-gyp": "^0.15.0",
81
-
"pacote": "^11.3.5",
82
-
"rimraf": "^3.0.2",
83
-
"tar": "^6.1.2",
84
-
"ts-node": "^10.4.0",
85
-
"typescript": "4.5.5"
86
-
},
87
-
"hakDependencies": {
88
-
"matrix-seshat": "^2.3.3",
89
-
"keytar": "^7.9.0"
90
-
},
91
-
"build": {
92
-
"appId": "im.riot.app",
93
-
"asarUnpack": "**/*.node",
94
-
"files": [
95
-
"package.json",
96
-
{
97
-
"from": ".hak/hakModules",
98
-
"to": "node_modules"
99
-
},
100
-
"lib/**"
101
-
],
102
-
"extraResources": [
103
-
{
104
-
"from": "res/img",
105
-
"to": "img"
106
-
},
107
-
"webapp.asar"
108
-
],
109
-
"linux": {
110
-
"target": "deb",
111
-
"category": "Network;InstantMessaging;Chat",
112
-
"maintainer": "support@element.io",
113
-
"desktop": {
114
-
"StartupWMClass": "element"
115
-
}
116
-
},
117
-
"mac": {
118
-
"category": "public.app-category.social-networking",
119
-
"darkModeSupport": true
120
-
},
121
-
"win": {
122
-
"target": {
123
-
"target": "squirrel"
124
-
},
125
-
"sign": "scripts/electron_winSign"
126
-
},
127
-
"directories": {
128
-
"output": "dist"
129
-
},
130
-
"afterPack": "scripts/electron_afterPack",
131
-
"afterSign": "scripts/electron_afterSign",
132
-
"protocols": [
133
-
{
134
-
"name": "element",
135
-
"schemes": [
136
-
"element"
137
-
]
138
-
}
139
-
]
140
-
}
141
-
}
···
+27
-16
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+27
-16
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
···
3
, fetchFromGitHub
4
, makeWrapper
5
, makeDesktopItem
6
-
, mkYarnPackage
7
, fetchYarnDeps
8
, electron
9
, element-web
···
22
keytar = callPackage ./keytar { inherit Security AppKit; };
23
seshat = callPackage ./seshat { inherit CoreServices; };
24
in
25
-
mkYarnPackage rec {
26
pname = "element-desktop";
27
inherit (pinData) version;
28
name = "${pname}-${version}";
···
33
sha256 = pinData.desktopSrcHash;
34
};
35
36
-
packageJSON = ./element-desktop-package.json;
37
offlineCache = fetchYarnDeps {
38
yarnLock = src + "/yarn.lock";
39
sha256 = pinData.desktopYarnHash;
40
};
41
42
-
nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
43
44
inherit seshat;
45
46
buildPhase = ''
47
runHook preBuild
48
-
export HOME=$(mktemp -d)
49
-
pushd deps/element-desktop/
50
-
yarn run build:ts
51
-
yarn run i18n
52
-
yarn run build:res
53
-
popd
54
rm -rf node_modules/matrix-seshat node_modules/keytar
55
${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"}
56
ln -s $seshat node_modules/matrix-seshat
57
runHook postBuild
58
'';
59
···
63
# resources
64
mkdir -p "$out/share/element"
65
ln -s '${element-web}' "$out/share/element/webapp"
66
-
cp -r './deps/element-desktop' "$out/share/element/electron"
67
-
cp -r './deps/element-desktop/res/img' "$out/share/element"
68
-
rm "$out/share/element/electron/node_modules"
69
cp -r './node_modules' "$out/share/element/electron"
70
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
71
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
···
89
90
runHook postInstall
91
'';
92
-
93
-
# Do not attempt generating a tarball for element-desktop again.
94
-
doDist = false;
95
96
# The desktop item properties should be kept in sync with data from upstream:
97
# https://github.com/vector-im/element-desktop/blob/develop/package.json
···
3
, fetchFromGitHub
4
, makeWrapper
5
, makeDesktopItem
6
+
, fixup_yarn_lock
7
+
, yarn
8
+
, nodejs
9
, fetchYarnDeps
10
, electron
11
, element-web
···
24
keytar = callPackage ./keytar { inherit Security AppKit; };
25
seshat = callPackage ./seshat { inherit CoreServices; };
26
in
27
+
stdenv.mkDerivation rec {
28
pname = "element-desktop";
29
inherit (pinData) version;
30
name = "${pname}-${version}";
···
35
sha256 = pinData.desktopSrcHash;
36
};
37
38
offlineCache = fetchYarnDeps {
39
yarnLock = src + "/yarn.lock";
40
sha256 = pinData.desktopYarnHash;
41
};
42
43
+
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper ]
44
+
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
45
46
inherit seshat;
47
+
48
+
configurePhase = ''
49
+
runHook preConfigure
50
+
51
+
export HOME=$(mktemp -d)
52
+
yarn config --offline set yarn-offline-mirror $offlineCache
53
+
fixup_yarn_lock yarn.lock
54
+
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
55
+
patchShebangs node_modules/
56
+
57
+
runHook postConfigure
58
+
'';
59
60
buildPhase = ''
61
runHook preBuild
62
+
63
+
yarn --offline run build:ts
64
+
yarn --offline run i18n
65
+
yarn --offline run build:res
66
+
67
rm -rf node_modules/matrix-seshat node_modules/keytar
68
${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"}
69
ln -s $seshat node_modules/matrix-seshat
70
+
71
runHook postBuild
72
'';
73
···
77
# resources
78
mkdir -p "$out/share/element"
79
ln -s '${element-web}' "$out/share/element/webapp"
80
+
cp -r '.' "$out/share/element/electron"
81
+
cp -r './res/img' "$out/share/element"
82
+
rm -rf "$out/share/element/electron/node_modules"
83
cp -r './node_modules' "$out/share/element/electron"
84
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
85
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
···
103
104
runHook postInstall
105
'';
106
107
# The desktop item properties should be kept in sync with data from upstream:
108
# https://github.com/vector-im/element-desktop/blob/develop/package.json
-206
pkgs/applications/networking/instant-messengers/element/element-web-package.json
-206
pkgs/applications/networking/instant-messengers/element/element-web-package.json
···
1
-
{
2
-
"name": "element-web",
3
-
"version": "1.11.0",
4
-
"description": "A feature-rich client for Matrix.org",
5
-
"author": "New Vector Ltd.",
6
-
"repository": {
7
-
"type": "git",
8
-
"url": "https://github.com/vector-im/element-web"
9
-
},
10
-
"license": "Apache-2.0",
11
-
"files": [
12
-
"lib",
13
-
"res",
14
-
"src",
15
-
"webpack.config.js",
16
-
"scripts",
17
-
"docs",
18
-
"release.sh",
19
-
"deploy",
20
-
"CHANGELOG.md",
21
-
"CONTRIBUTING.rst",
22
-
"LICENSE",
23
-
"README.md",
24
-
"AUTHORS.rst",
25
-
"package.json",
26
-
"contribute.json"
27
-
],
28
-
"style": "bundle.css",
29
-
"scripts": {
30
-
"i18n": "matrix-gen-i18n",
31
-
"prunei18n": "matrix-prune-i18n",
32
-
"diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
33
-
"clean": "rimraf lib webapp",
34
-
"build": "yarn clean && yarn build:genfiles && yarn build:bundle",
35
-
"build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
36
-
"build:jitsi": "node scripts/build-jitsi.js",
37
-
"build:res": "node scripts/copy-res.js",
38
-
"build:genfiles": "yarn build:res && yarn build:jitsi",
39
-
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
40
-
"build:bundle": "webpack --progress --bail --mode production",
41
-
"build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
42
-
"dist": "scripts/package.sh",
43
-
"start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"",
44
-
"start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"",
45
-
"start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
46
-
"start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
47
-
"lint": "yarn lint:types && yarn lint:js && yarn lint:style",
48
-
"lint:js": "eslint --max-warnings 0 src",
49
-
"lint:js-fix": "eslint --fix src",
50
-
"lint:types": "tsc --noEmit --jsx react",
51
-
"lint:style": "stylelint \"res/css/**/*.scss\"",
52
-
"test": "jest",
53
-
"coverage": "yarn test --coverage"
54
-
},
55
-
"dependencies": {
56
-
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
57
-
"browser-request": "^0.3.3",
58
-
"gfm.css": "^1.1.2",
59
-
"jsrsasign": "^10.5.25",
60
-
"katex": "^0.12.0",
61
-
"matrix-js-sdk": "19.0.0",
62
-
"matrix-react-sdk": "3.48.0",
63
-
"matrix-widget-api": "^0.1.0-beta.18",
64
-
"prop-types": "^15.7.2",
65
-
"react": "17.0.2",
66
-
"react-dom": "17.0.2",
67
-
"sanitize-html": "^2.3.2",
68
-
"ua-parser-js": "^0.7.24"
69
-
},
70
-
"devDependencies": {
71
-
"@babel/core": "^7.12.10",
72
-
"@babel/eslint-parser": "^7.12.10",
73
-
"@babel/eslint-plugin": "^7.12.10",
74
-
"@babel/plugin-proposal-class-properties": "^7.12.1",
75
-
"@babel/plugin-proposal-export-default-from": "^7.12.1",
76
-
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
77
-
"@babel/plugin-proposal-numeric-separator": "^7.12.7",
78
-
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
79
-
"@babel/plugin-proposal-optional-chaining": "^7.12.7",
80
-
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
81
-
"@babel/plugin-transform-runtime": "^7.12.10",
82
-
"@babel/preset-env": "^7.12.11",
83
-
"@babel/preset-react": "^7.12.10",
84
-
"@babel/preset-typescript": "^7.12.7",
85
-
"@babel/register": "^7.12.10",
86
-
"@babel/runtime": "^7.12.5",
87
-
"@principalstudio/html-webpack-inject-preload": "^1.2.7",
88
-
"@sentry/webpack-plugin": "^1.18.1",
89
-
"@svgr/webpack": "^5.5.0",
90
-
"@types/flux": "^3.1.9",
91
-
"@types/jest": "^27.0.2",
92
-
"@types/modernizr": "^3.5.3",
93
-
"@types/node": "^14.14.22",
94
-
"@types/react": "17.0.14",
95
-
"@types/react-dom": "17.0.9",
96
-
"@types/sanitize-html": "^2.3.1",
97
-
"@types/ua-parser-js": "^0.7.36",
98
-
"@typescript-eslint/eslint-plugin": "^5.6.0",
99
-
"@typescript-eslint/parser": "^5.6.0",
100
-
"allchange": "^1.0.6",
101
-
"autoprefixer": "^9.8.6",
102
-
"babel-jest": "^26.6.3",
103
-
"babel-loader": "^8.2.2",
104
-
"chokidar": "^3.5.1",
105
-
"concurrently": "^5.3.0",
106
-
"cpx": "^1.5.0",
107
-
"css-loader": "^3.6.0",
108
-
"dotenv": "^10.0.0",
109
-
"eslint": "8.9.0",
110
-
"eslint-config-google": "^0.14.0",
111
-
"eslint-plugin-import": "^2.25.4",
112
-
"eslint-plugin-matrix-org": "^0.4.0",
113
-
"eslint-plugin-react": "^7.28.0",
114
-
"eslint-plugin-react-hooks": "^4.3.0",
115
-
"extract-text-webpack-plugin": "^4.0.0-beta.0",
116
-
"fake-indexeddb": "^3.1.2",
117
-
"file-loader": "^5.1.0",
118
-
"fs-extra": "^0.30.0",
119
-
"html-webpack-plugin": "^4.5.2",
120
-
"jest": "^26.6.3",
121
-
"jest-environment-jsdom-sixteen": "^1.0.3",
122
-
"jest-raw-loader": "^1.0.1",
123
-
"jest-sonar-reporter": "^2.0.0",
124
-
"json-loader": "^0.5.7",
125
-
"loader-utils": "^1.4.0",
126
-
"matrix-mock-request": "^2.0.0",
127
-
"matrix-react-test-utils": "^0.2.3",
128
-
"matrix-web-i18n": "^1.3.0",
129
-
"mini-css-extract-plugin": "^0.12.0",
130
-
"minimist": "^1.2.6",
131
-
"mkdirp": "^1.0.4",
132
-
"modernizr": "^3.12.0",
133
-
"node-fetch": "^2.6.7",
134
-
"optimize-css-assets-webpack-plugin": "^5.0.4",
135
-
"postcss-easings": "^2.0.0",
136
-
"postcss-hexrgba": "^2.0.1",
137
-
"postcss-import": "^12.0.1",
138
-
"postcss-loader": "^3.0.0",
139
-
"postcss-mixins": "^6.2.3",
140
-
"postcss-nested": "^4.2.3",
141
-
"postcss-preset-env": "^6.7.0",
142
-
"postcss-scss": "^2.1.1",
143
-
"postcss-simple-vars": "^5.0.2",
144
-
"postcss-strip-inline-comments": "^0.1.5",
145
-
"raw-loader": "^4.0.2",
146
-
"rimraf": "^3.0.2",
147
-
"shell-escape": "^0.2.0",
148
-
"simple-proxy-agent": "^1.1.0",
149
-
"string-replace-loader": "2",
150
-
"style-loader": "2",
151
-
"stylelint": "^13.9.0",
152
-
"stylelint-config-standard": "^20.0.0",
153
-
"stylelint-scss": "^3.18.0",
154
-
"terser-webpack-plugin": "^2.3.8",
155
-
"typescript": "^4.5.3",
156
-
"webpack": "^4.46.0",
157
-
"webpack-cli": "^3.3.12",
158
-
"webpack-dev-server": "^3.11.2",
159
-
"worker-loader": "^2.0.0",
160
-
"worklet-loader": "^2.0.0"
161
-
},
162
-
"resolutions": {
163
-
"@types/react": "17.0.14"
164
-
},
165
-
"jest": {
166
-
"testEnvironment": "jest-environment-jsdom-sixteen",
167
-
"testMatch": [
168
-
"<rootDir>/test/**/*-test.[tj]s?(x)"
169
-
],
170
-
"setupFilesAfterEnv": [
171
-
"<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
172
-
],
173
-
"moduleNameMapper": {
174
-
"\\.(css|scss)$": "<rootDir>/__mocks__/cssMock.js",
175
-
"\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
176
-
"\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
177
-
"\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
178
-
"^browser-request$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/browser-request.js",
179
-
"^react$": "<rootDir>/node_modules/react",
180
-
"^react-dom$": "<rootDir>/node_modules/react-dom",
181
-
"^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
182
-
"^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
183
-
"decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
184
-
"decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
185
-
"waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
186
-
"context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
187
-
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
188
-
"workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
189
-
"^!!raw-loader!.*": "jest-raw-loader",
190
-
"RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js"
191
-
},
192
-
"transformIgnorePatterns": [
193
-
"/node_modules/(?!matrix-js-sdk).+$",
194
-
"/node_modules/(?!matrix-react-sdk).+$"
195
-
],
196
-
"coverageReporters": [
197
-
"text-summary",
198
-
"lcov"
199
-
],
200
-
"testResultsProcessor": "jest-sonar-reporter"
201
-
},
202
-
"jestSonar": {
203
-
"reportPath": "coverage",
204
-
"sonar56x": true
205
-
}
206
-
}
···
+15
-16
pkgs/applications/networking/instant-messengers/element/element-web.nix
+15
-16
pkgs/applications/networking/instant-messengers/element/element-web.nix
···
1
{ lib
2
-
, mkYarnPackage
3
, runCommand
4
, fetchFromGitHub
5
, fetchYarnDeps
···
7
, jq
8
, yarn
9
, fixup_yarn_lock
10
, jitsi-meet
11
, conf ? { }
12
}:
···
19
};
20
configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
21
22
-
in
23
-
mkYarnPackage rec {
24
pname = "element-web";
25
inherit (pinData) version;
26
···
31
sha256 = pinData.webSrcHash;
32
};
33
34
-
packageJSON = ./element-web-package.json;
35
-
# Remove the matrix-analytics-events dependency from the matrix-react-sdk
36
-
# dependencies list. It doesn't seem to be necessary since we already are
37
-
# installing it individually, and it causes issues with the offline mode.
38
-
yarnLock = (runCommand "${pname}-modified-lock" {} ''
39
-
sed '/matrix-analytics-events "github/d' ${src}/yarn.lock > "$out"
40
-
'');
41
offlineCache = fetchYarnDeps {
42
-
inherit yarnLock;
43
sha256 = pinData.webYarnHash;
44
};
45
46
-
nativeBuildInputs = [ jq ];
47
48
configurePhase = ''
49
runHook preConfigure
50
-
ln -s $node_modules node_modules
51
runHook postConfigure
52
'';
53
···
56
57
export VERSION=${version}
58
yarn build:res --offline
59
yarn build:bundle --offline
60
61
runHook postBuild
···
71
72
runHook postInstall
73
'';
74
-
75
-
# Do not attempt generating a tarball for element-web again.
76
-
doDist = false;
77
78
meta = {
79
description = "A glossy Matrix collaboration client for the web";
···
1
{ lib
2
+
, stdenv
3
, runCommand
4
, fetchFromGitHub
5
, fetchYarnDeps
···
7
, jq
8
, yarn
9
, fixup_yarn_lock
10
+
, nodejs
11
, jitsi-meet
12
, conf ? { }
13
}:
···
20
};
21
configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
22
23
+
in stdenv.mkDerivation rec {
24
pname = "element-web";
25
inherit (pinData) version;
26
···
31
sha256 = pinData.webSrcHash;
32
};
33
34
offlineCache = fetchYarnDeps {
35
+
yarnLock = src + "/yarn.lock";
36
sha256 = pinData.webYarnHash;
37
};
38
39
+
nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ];
40
41
configurePhase = ''
42
runHook preConfigure
43
+
44
+
export HOME=$PWD/tmp
45
+
mkdir -p $HOME
46
+
47
+
fixup_yarn_lock yarn.lock
48
+
yarn config --offline set yarn-offline-mirror $offlineCache
49
+
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
50
+
patchShebangs node_modules
51
+
52
runHook postConfigure
53
'';
54
···
57
58
export VERSION=${version}
59
yarn build:res --offline
60
+
yarn build:module_system --offline
61
yarn build:bundle --offline
62
63
runHook postBuild
···
73
74
runHook postInstall
75
'';
76
77
meta = {
78
description = "A glossy Matrix collaboration client for the web";
+5
-5
pkgs/applications/networking/instant-messengers/element/pin.json
+5
-5
pkgs/applications/networking/instant-messengers/element/pin.json
···
1
{
2
-
"version": "1.11.0",
3
-
"desktopSrcHash": "WYXPsiR3hKj+cPvs5bLzZ301vLISp3ANLf/GgBBMYqM=",
4
-
"desktopYarnHash": "0v60ak06g87i3q5rqgxy3v3whk3njj0v1ml9rfdab1mbzrj6209c",
5
-
"webSrcHash": "L6ONDjGy8Uuo7E4O5ajIYdDLYL59JkuUk9hAAlTID1k=",
6
-
"webYarnHash": "15qhw2z05ylxvidaaifpxxdpd68s7qbwpgx9y95x6v82fcr7xhrz"
7
}
···
1
{
2
+
"version": "1.11.3",
3
+
"desktopSrcHash": "DJqnMEN7KlRIGefMcZCp27xLnPEoSR8Ml5sN5JfqNSM=",
4
+
"desktopYarnHash": "15wa3ggw1zcc17lfhzig5qw1bpiph7qd6h53qc5nahmfan4jv06a",
5
+
"webSrcHash": "D95eVWTAvpStOZK0cjP2V8k1ZTnkGLsA0/woVGqDKEI=",
6
+
"webYarnHash": "1i0djpnn545n83nmm0hm752b66ai1kh3irkfpvw98300c6q1m7fx"
7
}
-3
pkgs/applications/networking/instant-messengers/element/update.sh
-3
pkgs/applications/networking/instant-messengers/element/update.sh
···
21
# Element Web
22
web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version"
23
web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .sha256)
24
-
wget "$web_src/package.json" -O element-web-package.json
25
26
web_tmpdir=$(mktemp -d)
27
trap 'rm -rf "$web_tmpdir"' EXIT
28
29
pushd $web_tmpdir
30
wget "$web_src/yarn.lock"
31
-
sed -i '/matrix-analytics-events "github/d' yarn.lock
32
web_yarn_hash=$(prefetch-yarn-deps yarn.lock)
33
popd
34
35
# Element Desktop
36
desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version"
37
desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256)
38
-
wget "$desktop_src/package.json" -O element-desktop-package.json
39
40
desktop_tmpdir=$(mktemp -d)
41
trap 'rm -rf "$desktop_tmpdir"' EXIT
···
21
# Element Web
22
web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version"
23
web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .sha256)
24
25
web_tmpdir=$(mktemp -d)
26
trap 'rm -rf "$web_tmpdir"' EXIT
27
28
pushd $web_tmpdir
29
wget "$web_src/yarn.lock"
30
web_yarn_hash=$(prefetch-yarn-deps yarn.lock)
31
popd
32
33
# Element Desktop
34
desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version"
35
desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256)
36
37
desktop_tmpdir=$(mktemp -d)
38
trap 'rm -rf "$desktop_tmpdir"' EXIT
+2
-2
pkgs/applications/virtualization/docker/buildx.nix
+2
-2
pkgs/applications/virtualization/docker/buildx.nix
+5
-1
pkgs/development/libraries/libbencodetools/default.nix
pkgs/development/libraries/bencodetools/default.nix
+5
-1
pkgs/development/libraries/libbencodetools/default.nix
pkgs/development/libraries/bencodetools/default.nix
···
5
}:
6
7
stdenv.mkDerivation rec {
8
+
pname = "bencodetools";
9
version = "unstable-2022-05-11";
10
11
src = fetchFromGitLab {
···
26
nativeBuildInputs = [
27
python3
28
];
29
+
30
+
# installCheck instead of check due to -install_name'd library on Darwin
31
+
doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform;
32
+
installCheckTarget = "check";
33
34
meta = with lib; {
35
description = "Collection of tools for manipulating bencoded data";
+9
-2
pkgs/development/libraries/libvirt/default.nix
+9
-2
pkgs/development/libraries/libvirt/default.nix
···
36
, xhtml1
37
, yajl
38
, writeScript
39
40
# Linux
41
, acl ? null
···
113
# NOTE: You must also bump:
114
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
115
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
116
-
version = "8.5.0";
117
118
src = fetchFromGitLab {
119
owner = pname;
120
repo = pname;
121
rev = "v${version}";
122
-
sha256 = "sha256-x6TnMFYjcUSdQZd9ctN2hITCAl9TGVb7/qAObGb9xMk=";
123
fetchSubmodules = true;
124
};
125
···
133
sed -i '/virnetsockettest/d' tests/meson.build
134
# delete only the first occurrence of this
135
sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build
136
'' + optionalString isDarwin ''
137
sed -i '/qemucapabilitiestest/d' tests/meson.build
138
sed -i '/vircryptotest/d' tests/meson.build
···
344
update-source-version python3Packages.${pname} "$libvirtVersion"
345
update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix"
346
'';
347
348
meta = {
349
homepage = "https://libvirt.org/";
···
36
, xhtml1
37
, yajl
38
, writeScript
39
+
, nixosTests
40
41
# Linux
42
, acl ? null
···
114
# NOTE: You must also bump:
115
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
116
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
117
+
version = "8.6.0";
118
119
src = fetchFromGitLab {
120
owner = pname;
121
repo = pname;
122
rev = "v${version}";
123
+
sha256 = "sha256-bSId7G2o808WfHGt5ioFEIhPyy4+XW+R349UgHKOvQU=";
124
fetchSubmodules = true;
125
};
126
···
134
sed -i '/virnetsockettest/d' tests/meson.build
135
# delete only the first occurrence of this
136
sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build
137
+
'' + optionalString isLinux ''
138
+
sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \
139
+
src/storage/storage_backend_disk.c \
140
+
src/storage/storage_util.c
141
'' + optionalString isDarwin ''
142
sed -i '/qemucapabilitiestest/d' tests/meson.build
143
sed -i '/vircryptotest/d' tests/meson.build
···
349
update-source-version python3Packages.${pname} "$libvirtVersion"
350
update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix"
351
'';
352
+
353
+
passthru.tests.libvirtd = nixosTests.libvirtd;
354
355
meta = {
356
homepage = "https://libvirt.org/";
+2
-2
pkgs/development/python-modules/aioesphomeapi/default.nix
+2
-2
pkgs/development/python-modules/aioesphomeapi/default.nix
···
12
13
buildPythonPackage rec {
14
pname = "aioesphomeapi";
15
-
version = "10.11.0";
16
format = "setuptools";
17
18
disabled = pythonOlder "3.7";
···
21
owner = "esphome";
22
repo = pname;
23
rev = "refs/tags/v${version}";
24
-
sha256 = "sha256-Wb46t+bdXGDYKzMr73YNWw1ULSLEV1xFcK16jHITnRg=";
25
};
26
27
propagatedBuildInputs = [
···
12
13
buildPythonPackage rec {
14
pname = "aioesphomeapi";
15
+
version = "10.13.0";
16
format = "setuptools";
17
18
disabled = pythonOlder "3.7";
···
21
owner = "esphome";
22
repo = pname;
23
rev = "refs/tags/v${version}";
24
+
sha256 = "sha256-ZaNrSkRH9pFhzZncCs37k1M0w5svPfrY0WxePUnUlms=";
25
};
26
27
propagatedBuildInputs = [
+2
-2
pkgs/development/python-modules/allure-python-commons-test/default.nix
+2
-2
pkgs/development/python-modules/allure-python-commons-test/default.nix
+9
pkgs/development/python-modules/folium/default.nix
+9
pkgs/development/python-modules/folium/default.nix
···
1
{ lib
2
, buildPythonPackage
3
, fetchFromGitHub
4
+
, fetchpatch
5
, pythonOlder
6
, pytestCheckHook
7
, branca
···
27
rev = "v${version}";
28
sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA=";
29
};
30
+
31
+
patches = [
32
+
# Fix test failures with latest branca
33
+
(fetchpatch {
34
+
url = "https://github.com/python-visualization/folium/commit/b410ab21cc46ec6756c2f755e5e81dcdca029c53.patch";
35
+
hash = "sha256-SVN4wKEep+VnAKnkJTf59rhnzHnbk6dV9XL5ntv4bog=";
36
+
})
37
+
];
38
39
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
40
+2
-2
pkgs/development/python-modules/gigalixir/default.nix
+2
-2
pkgs/development/python-modules/gigalixir/default.nix
···
18
19
buildPythonApplication rec {
20
pname = "gigalixir";
21
-
version = "1.2.6";
22
format = "setuptools";
23
24
disabled = pythonOlder "3.7";
25
26
src = fetchPypi {
27
inherit pname version;
28
-
hash = "sha256-a2kU5vUSiOg0yFvGLxE2Edgyrar7psBD4NPEmDsP3IY=";
29
};
30
31
propagatedBuildInputs = [
···
18
19
buildPythonApplication rec {
20
pname = "gigalixir";
21
+
version = "1.3.0";
22
format = "setuptools";
23
24
disabled = pythonOlder "3.7";
25
26
src = fetchPypi {
27
inherit pname version;
28
+
hash = "sha256-kNtybgv8j7t1tl6R5ZuC4vj5fnEcEenuNt0twA1kAh0=";
29
};
30
31
propagatedBuildInputs = [
+2
-2
pkgs/development/python-modules/ipympl/default.nix
+2
-2
pkgs/development/python-modules/ipympl/default.nix
+2
-2
pkgs/development/python-modules/libvirt/default.nix
+2
-2
pkgs/development/python-modules/libvirt/default.nix
+2
-2
pkgs/development/python-modules/osmnx/default.nix
+2
-2
pkgs/development/python-modules/osmnx/default.nix
···
3
4
buildPythonPackage rec {
5
pname = "osmnx";
6
-
version = "1.2.0";
7
disabled = pythonOlder "3.8";
8
9
src = fetchFromGitHub {
10
owner = "gboeing";
11
repo = pname;
12
rev = "v${version}";
13
-
sha256 = "sha256-HfgMmPEiKstMXV0rtul8QLxB1FY32Ws7IEonBB+qZOc=";
14
};
15
16
propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ];
···
3
4
buildPythonPackage rec {
5
pname = "osmnx";
6
+
version = "1.2.2";
7
disabled = pythonOlder "3.8";
8
9
src = fetchFromGitHub {
10
owner = "gboeing";
11
repo = pname;
12
rev = "v${version}";
13
+
sha256 = "sha256-+dUv1QrUmCIOCyUyjYX1kJtZrPuSp3t9xz/sRV7ppgA=";
14
};
15
16
propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ];
+105
-29
pkgs/development/python-modules/psycopg/default.nix
+105
-29
pkgs/development/python-modules/psycopg/default.nix
···
6
, pythonOlder
7
, substituteAll
8
9
-
# links (libpq)
10
, postgresql
11
12
# propagates
13
, backports-zoneinfo
14
, typing-extensions
15
16
# docs
17
, furo
···
29
let
30
pname = "psycopg";
31
version = "3.0.16";
32
-
in
33
-
34
-
buildPythonPackage {
35
-
inherit pname version;
36
-
format = "pyproject";
37
-
38
-
disabled = pythonOlder "3.7";
39
40
src = fetchFromGitHub {
41
owner = "psycopg";
···
44
hash = "sha256-jKhpmCcDi7FyMSpn51eSukFvmu3yacNovmRYG9jnu3g=";
45
};
46
47
outputs = [
48
"out"
49
"doc"
···
57
hash = "sha256-yn09fR9+7zQni8SvTG7BUmYRD7MK7u2arVAznWz2oAw=";
58
};
59
60
-
patches = [
61
-
(substituteAll {
62
-
src = ./libpq.patch;
63
-
libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
64
-
})
65
-
];
66
67
# only move to sourceRoot after patching, makes patching easier
68
postPatch = ''
69
-
cd ${pname}
70
'';
71
72
nativeBuildInputs = [
73
furo
74
shapely
75
-
sphinxHook
76
sphinx-autodoc-typehints
77
];
78
79
-
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [
80
typing-extensions
81
] ++ lib.optionals (pythonOlder "3.9") [
82
backports-zoneinfo
···
84
85
pythonImportsCheck = [
86
"psycopg"
87
];
88
89
passthru.optional-dependencies = {
90
-
# TODO: package remaining variants
91
-
#c = [ psycopg-c ];
92
-
#pool = [ psycopg-pool ];
93
};
94
95
preCheck = ''
···
102
pytest-randomly
103
pytestCheckHook
104
postgresql
105
-
];
106
107
disabledTests = [
108
-
# linters shouldn't be run in checks
109
"test_version"
110
];
111
112
disabledTestPaths = [
113
-
# TODO: requires the pooled variant
114
-
"tests/pool/"
115
# Network access
116
"tests/test_dns.py"
117
"tests/test_dns_srv.py"
···
127
cd ${pname}
128
'';
129
130
-
meta = with lib; {
131
-
changelog = "https://github.com/psycopg/psycopg/blob/master/docs/news.rst";
132
description = "PostgreSQL database adapter for Python";
133
-
homepage = "https://github.com/psycopg/psycopg";
134
-
license = licenses.lgpl3Plus;
135
-
maintainers = with maintainers; [ hexa ];
136
};
137
}
···
6
, pythonOlder
7
, substituteAll
8
9
+
# build
10
, postgresql
11
+
, setuptools
12
13
# propagates
14
, backports-zoneinfo
15
, typing-extensions
16
+
17
+
# psycopg-c
18
+
, cython_3
19
20
# docs
21
, furo
···
33
let
34
pname = "psycopg";
35
version = "3.0.16";
36
37
src = fetchFromGitHub {
38
owner = "psycopg";
···
41
hash = "sha256-jKhpmCcDi7FyMSpn51eSukFvmu3yacNovmRYG9jnu3g=";
42
};
43
44
+
patches = [
45
+
(substituteAll {
46
+
src = ./libpq.patch;
47
+
libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
48
+
})
49
+
];
50
+
51
+
baseMeta = {
52
+
changelog = "https://github.com/psycopg/psycopg/blob/master/docs/news.rst";
53
+
homepage = "https://github.com/psycopg/psycopg";
54
+
license = lib.licenses.lgpl3Plus;
55
+
maintainers = with lib.maintainers; [ hexa ];
56
+
};
57
+
58
+
psycopg-c = buildPythonPackage {
59
+
pname = "${pname}-c";
60
+
inherit version src;
61
+
format = "pyproject";
62
+
63
+
# apply patches to base repo
64
+
inherit patches;
65
+
66
+
# move into source root after patching
67
+
postPatch = ''
68
+
cd psycopg_c
69
+
'';
70
+
71
+
nativeBuildInputs = [
72
+
setuptools
73
+
cython_3
74
+
postgresql
75
+
];
76
+
77
+
# tested in psycopg
78
+
doCheck = false;
79
+
80
+
meta = baseMeta // {
81
+
description = "C optimisation distribution for Psycopg";
82
+
};
83
+
};
84
+
85
+
psycopg-pool = buildPythonPackage {
86
+
pname = "${pname}-pool";
87
+
inherit version src;
88
+
format = "setuptools";
89
+
90
+
# apply patches to base repo
91
+
inherit patches;
92
+
93
+
# move into source root after patching
94
+
postPatch = ''
95
+
cd psycopg_pool
96
+
'';
97
+
98
+
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
99
+
typing-extensions
100
+
];
101
+
102
+
# tested in psycopg
103
+
doCheck = false;
104
+
105
+
meta = baseMeta // {
106
+
description = "Connection Pool for Psycopg";
107
+
};
108
+
};
109
+
110
+
in
111
+
112
+
buildPythonPackage rec {
113
+
inherit pname version src;
114
+
format = "pyproject";
115
+
116
+
disabled = pythonOlder "3.7";
117
+
118
outputs = [
119
"out"
120
"doc"
···
128
hash = "sha256-yn09fR9+7zQni8SvTG7BUmYRD7MK7u2arVAznWz2oAw=";
129
};
130
131
+
inherit patches;
132
133
# only move to sourceRoot after patching, makes patching easier
134
postPatch = ''
135
+
cd psycopg
136
'';
137
138
nativeBuildInputs = [
139
furo
140
+
setuptools
141
shapely
142
sphinx-autodoc-typehints
143
+
sphinxHook
144
];
145
146
+
propagatedBuildInputs = [
147
+
psycopg-c
148
+
] ++ lib.optionals (pythonOlder "3.11") [
149
typing-extensions
150
] ++ lib.optionals (pythonOlder "3.9") [
151
backports-zoneinfo
···
153
154
pythonImportsCheck = [
155
"psycopg"
156
+
"psycopg_c"
157
+
"psycopg_pool"
158
];
159
160
passthru.optional-dependencies = {
161
+
c = [ psycopg-c ];
162
+
pool = [ psycopg-pool ];
163
};
164
165
preCheck = ''
···
172
pytest-randomly
173
pytestCheckHook
174
postgresql
175
+
]
176
+
++ passthru.optional-dependencies.c
177
+
++ passthru.optional-dependencies.pool;
178
179
disabledTests = [
180
+
# don't depend on mypy for tests
181
"test_version"
182
+
"test_package_version"
183
+
] ++ lib.optionals (stdenv.isDarwin) [
184
+
# racy test
185
+
"test_sched"
186
+
"test_sched_error"
187
];
188
189
disabledTestPaths = [
190
# Network access
191
"tests/test_dns.py"
192
"tests/test_dns_srv.py"
···
202
cd ${pname}
203
'';
204
205
+
passthru = {
206
+
c = psycopg-c;
207
+
pool = psycopg-pool;
208
+
};
209
+
210
+
meta = baseMeta // {
211
description = "PostgreSQL database adapter for Python";
212
};
213
}
+2
-2
pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+2
-2
pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+20
-11
pkgs/development/tools/continuous-integration/github-runner/default.nix
+20
-11
pkgs/development/tools/continuous-integration/github-runner/default.nix
···
225
226
# Install the helper scripts to bin/ to resemble the upstream package
227
mkdir -p $out/bin
228
-
install -m755 src/Misc/layoutbin/runsvc.sh $out/bin/
229
-
install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/
230
-
install -m755 src/Misc/layoutroot/run.sh $out/lib/
231
-
install -m755 src/Misc/layoutroot/config.sh $out/lib/
232
-
install -m755 src/Misc/layoutroot/env.sh $out/lib/
233
234
# Rewrite reference in helper scripts from bin/ to lib/
235
-
substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' "$out/lib"
236
-
substituteInPlace $out/lib/config.sh --replace './bin' "$out/lib"
237
238
# Make paths absolute
239
substituteInPlace $out/bin/runsvc.sh \
···
269
wrap() {
270
makeWrapper $out/lib/$1 $out/bin/$1 \
271
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \
272
-
''${@:2}
273
}
274
275
fix_rpath Runner.Listener
···
279
wrap Runner.Listener
280
wrap Runner.PluginHost
281
wrap Runner.Worker
282
-
wrap run.sh
283
-
wrap env.sh
284
285
-
wrap config.sh --prefix PATH : ${lib.makeBinPath [ glibc.bin ]}
286
'';
287
288
# Script to create deps.nix file for dotnet dependencies. Run it with
···
225
226
# Install the helper scripts to bin/ to resemble the upstream package
227
mkdir -p $out/bin
228
+
install -m755 src/Misc/layoutbin/runsvc.sh $out/bin/
229
+
install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/
230
+
install -m755 src/Misc/layoutroot/run.sh $out/lib/
231
+
install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/run-helper.sh
232
+
install -m755 src/Misc/layoutroot/config.sh $out/lib/
233
+
install -m755 src/Misc/layoutroot/env.sh $out/lib/
234
235
# Rewrite reference in helper scripts from bin/ to lib/
236
+
substituteInPlace $out/lib/run.sh --replace '"$DIR"/bin' '"$DIR"/lib'
237
+
substituteInPlace $out/lib/config.sh --replace './bin' $out'/lib' \
238
+
--replace 'source ./env.sh' $out/bin/env.sh
239
+
240
+
# Remove uneeded copy for run-helper template
241
+
substituteInPlace $out/lib/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
242
+
substituteInPlace $out/lib/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
243
244
# Make paths absolute
245
substituteInPlace $out/bin/runsvc.sh \
···
275
wrap() {
276
makeWrapper $out/lib/$1 $out/bin/$1 \
277
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (buildInputs ++ [ openssl ])} \
278
+
"''${@:2}"
279
}
280
281
fix_rpath Runner.Listener
···
285
wrap Runner.Listener
286
wrap Runner.PluginHost
287
wrap Runner.Worker
288
+
wrap run.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}'
289
+
wrap env.sh --run 'cd $RUNNER_ROOT'
290
291
+
wrap config.sh --run 'export RUNNER_ROOT=''${RUNNER_ROOT:-$HOME/.github-runner}' \
292
+
--run 'mkdir -p $RUNNER_ROOT' \
293
+
--prefix PATH : ${lib.makeBinPath [ glibc.bin ]} \
294
+
--chdir $out
295
'';
296
297
# Script to create deps.nix file for dotnet dependencies. Run it with
+3
-3
pkgs/games/onscripter-en/default.nix
+3
-3
pkgs/games/onscripter-en/default.nix
···
5
6
stdenv.mkDerivation {
7
pname = "onscripter-en";
8
-
version = "20110930";
9
10
src = fetchurl {
11
# The website is not available now.
12
-
url = "https://www.dropbox.com/s/ag21owy9poyr2oy/onscripter-en-20110930-src.tar.bz2";
13
-
sha256 = "1kzm6d894c0ihgkwhd03x3kaqqz0sb6kf0r86xrrz12y309zfam6";
14
};
15
16
buildInputs = [ libpng libjpeg libogg libvorbis freetype smpeg
···
5
6
stdenv.mkDerivation {
7
pname = "onscripter-en";
8
+
version = "20111009";
9
10
src = fetchurl {
11
# The website is not available now.
12
+
url = "https://www.dropbox.com/s/ag21owy9poyr2oy/onscripter-en-20111009-src.tar.bz2";
13
+
sha256 = "sha256-pir3ExhehJ9zNygDN83S4GOs5ugDNMjngxEwklAz9c8=";
14
};
15
16
buildInputs = [ libpng libjpeg libogg libvorbis freetype smpeg
+33
-7
pkgs/misc/solfege/default.nix
+33
-7
pkgs/misc/solfege/default.nix
···
2
, buildPythonApplication, pycairo, pygobject3
3
, gobject-introspection, gtk3, librsvg
4
, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
5
}:
6
7
buildPythonApplication rec {
···
9
version = "3.23.4";
10
11
src = fetchurl {
12
-
url = "mirror://sourceforge/solfege/solfege-${version}.tar.gz";
13
sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
14
};
15
···
20
./webbrowser.patch
21
];
22
23
-
nativeBuildInputs = [ gettext pkg-config texinfo wrapGAppsHook ];
24
-
buildInputs = [ gobject-introspection gtk3 librsvg ];
25
-
propagatedBuildInputs = [ pycairo pygobject3 ];
26
27
preBuild = ''
28
sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
···
40
41
meta = with lib; {
42
description = "Ear training program";
43
-
homepage = "https://www.solfege.org/";
44
-
license = licenses.gpl3;
45
platforms = platforms.linux;
46
-
maintainers = with maintainers; [ bjornfor orivej ];
47
};
48
}
···
2
, buildPythonApplication, pycairo, pygobject3
3
, gobject-introspection, gtk3, librsvg
4
, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
5
+
, automake, autoconf
6
}:
7
8
buildPythonApplication rec {
···
10
version = "3.23.4";
11
12
src = fetchurl {
13
+
url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz";
14
sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
15
};
16
···
21
./webbrowser.patch
22
];
23
24
+
preConfigure = ''
25
+
aclocal
26
+
autoconf
27
+
'';
28
+
29
+
nativeBuildInputs = [
30
+
automake
31
+
autoconf
32
+
33
+
gettext
34
+
pkg-config
35
+
texinfo
36
+
37
+
# https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
38
+
gobject-introspection
39
+
wrapGAppsHook
40
+
];
41
+
42
+
buildInputs = [
43
+
gobject-introspection
44
+
gtk3
45
+
librsvg
46
+
];
47
+
48
+
propagatedBuildInputs = [
49
+
pycairo
50
+
pygobject3
51
+
];
52
53
preBuild = ''
54
sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
···
66
67
meta = with lib; {
68
description = "Ear training program";
69
+
homepage = "https://www.gnu.org/software/solfege/";
70
+
license = licenses.gpl3Only;
71
platforms = platforms.linux;
72
+
maintainers = with maintainers; [ bjornfor orivej anthonyroussel ];
73
};
74
}
+2
-2
pkgs/servers/web-apps/wiki-js/default.nix
+2
-2
pkgs/servers/web-apps/wiki-js/default.nix
+1
-1
pkgs/tools/misc/mmv-go/default.nix
+1
-1
pkgs/tools/misc/mmv-go/default.nix
+3
-3
pkgs/tools/networking/findomain/default.nix
+3
-3
pkgs/tools/networking/findomain/default.nix
···
10
11
rustPlatform.buildRustPackage rec {
12
pname = "findomain";
13
-
version = "8.2.0";
14
15
src = fetchFromGitHub {
16
owner = "Edu4rdSHL";
17
repo = pname;
18
rev = version;
19
-
sha256 = "sha256-VT4iPm6CbuKw9D53eSvunRC4Yvn94D5J95JJyq1Za9M=";
20
};
21
22
-
cargoSha256 = "sha256-gwBsIFhMHTISlKXCBqhzYhq0p5yX0OE0/zcU1yTOADQ=";
23
24
nativeBuildInputs = [ installShellFiles perl ];
25
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
···
10
11
rustPlatform.buildRustPackage rec {
12
pname = "findomain";
13
+
version = "8.2.1";
14
15
src = fetchFromGitHub {
16
owner = "Edu4rdSHL";
17
repo = pname;
18
rev = version;
19
+
sha256 = "sha256-NlaQhQtGQzOaTD18NMiicQOrovRuTCUq54vxu34JqIU=";
20
};
21
22
+
cargoSha256 = "sha256-I9OyH02JNdNgGK3918XwS5wt+11VppCTqzo50LuhnvI=";
23
24
nativeBuildInputs = [ installShellFiles perl ];
25
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+2
pkgs/top-level/aliases.nix
+2
pkgs/top-level/aliases.nix
···
700
letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
701
libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22
702
libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
703
libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
704
libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
705
libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22
···
1438
1439
### U ###
1440
1441
uberwriter = apostrophe; # Added 2020-04-23
1442
ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21
1443
uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02
···
700
letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22
701
libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22
702
libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
703
+
libbencodetools = bencodetools; # Added 2022-07-30
704
libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
705
libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
706
libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22
···
1439
1440
### U ###
1441
1442
+
uade123 = uade; # Added 2022-07-30
1443
uberwriter = apostrophe; # Added 2020-04-23
1444
ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21
1445
uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02
+3
-3
pkgs/top-level/all-packages.nix
+3
-3
pkgs/top-level/all-packages.nix
···
17348
17349
belr = callPackage ../development/libraries/belr { };
17350
17351
beignet = callPackage ../development/libraries/beignet {
17352
inherit (llvmPackages_6) libllvm libclang;
17353
};
···
18943
libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
18944
18945
libbde = callPackage ../development/libraries/libbde { };
18946
-
18947
-
libbencodetools = callPackage ../development/libraries/libbencodetools { };
18948
18949
libbdplus = callPackage ../development/libraries/libbdplus { };
18950
···
30478
inherit (gnome) zenity;
30479
};
30480
30481
-
uade123 = callPackage ../applications/audio/uade123 {};
30482
30483
udevil = callPackage ../applications/misc/udevil {};
30484
···
17348
17349
belr = callPackage ../development/libraries/belr { };
17350
17351
+
bencodetools = callPackage ../development/libraries/bencodetools { };
17352
+
17353
beignet = callPackage ../development/libraries/beignet {
17354
inherit (llvmPackages_6) libllvm libclang;
17355
};
···
18945
libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
18946
18947
libbde = callPackage ../development/libraries/libbde { };
18948
18949
libbdplus = callPackage ../development/libraries/libbdplus { };
18950
···
30478
inherit (gnome) zenity;
30479
};
30480
30481
+
uade = callPackage ../applications/audio/uade {};
30482
30483
udevil = callPackage ../applications/misc/udevil {};
30484
+2
-2
pkgs/top-level/perl-packages.nix
+2
-2
pkgs/top-level/perl-packages.nix
···
22599
22600
SysVirt = buildPerlModule rec {
22601
pname = "Sys-Virt";
22602
-
version = "8.4.0";
22603
src = fetchFromGitLab {
22604
owner = "libvirt";
22605
repo = "libvirt-perl";
22606
rev = "v${version}";
22607
-
sha256 = "sha256-nw9KG3dO0Oxre2NVp+4Z+kgIluU5j1xOu8grZJRXhik=";
22608
};
22609
nativeBuildInputs = [ pkgs.pkg-config ];
22610
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
···
22599
22600
SysVirt = buildPerlModule rec {
22601
pname = "Sys-Virt";
22602
+
version = "8.5.0";
22603
src = fetchFromGitLab {
22604
owner = "libvirt";
22605
repo = "libvirt-perl";
22606
rev = "v${version}";
22607
+
sha256 = "sha256-VuM4rPrG15vXnF5e1MBSGB76zLI+8nkSiJmwWg8aJgE=";
22608
};
22609
nativeBuildInputs = [ pkgs.pkg-config ];
22610
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];