pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub da0e7f5f d4d49c10
+18
-4
pkgs/applications/audio/ptcollab/default.nix
+18
-4
pkgs/applications/audio/ptcollab/default.nix
···
1
1
{ mkDerivation
2
-
, lib, stdenv
2
+
, lib
3
+
, stdenv
3
4
, fetchFromGitHub
5
+
, nix-update-script
4
6
, qmake
5
7
, qtbase
6
8
, qtmultimedia
7
9
, libvorbis
10
+
, rtmidi
8
11
}:
9
12
10
13
mkDerivation rec {
11
14
pname = "ptcollab";
12
-
version = "0.3.5.1";
15
+
version = "0.4.0";
13
16
14
17
src = fetchFromGitHub {
15
18
owner = "yuxshao";
16
19
repo = "ptcollab";
17
20
rev = "v${version}";
18
-
sha256 = "1ahfxjm1chz8k65rs7rgn4s2bgippq58fjcxl8fr21pzn718wqf1";
21
+
sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85";
19
22
};
20
23
24
+
postPatch = ''
25
+
substituteInPlace src/editor.pro \
26
+
--replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi'
27
+
'';
28
+
21
29
nativeBuildInputs = [ qmake ];
22
30
23
-
buildInputs = [ qtbase qtmultimedia libvorbis ];
31
+
buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ];
32
+
33
+
passthru = {
34
+
updateScript = nix-update-script {
35
+
attrPath = pname;
36
+
};
37
+
};
24
38
25
39
meta = with lib; {
26
40
description = "Experimental pxtone editor where you can collaborate with friends";
+2
-2
pkgs/applications/networking/flexget/default.nix
+2
-2
pkgs/applications/networking/flexget/default.nix
···
2
2
3
3
python3Packages.buildPythonApplication rec {
4
4
pname = "FlexGet";
5
-
version = "3.1.106";
5
+
version = "3.1.110";
6
6
7
7
src = python3Packages.fetchPypi {
8
8
inherit pname version;
9
-
sha256 = "f0ff300a1762d701b77eb16142dcc13d9d099bbed695f1e950392c1d1bb988eb";
9
+
sha256 = "e8642dcbbfe941e2d2def7bf2e28889082a78c1d041edb33dae180036832a96b";
10
10
};
11
11
12
12
postPatch = ''
+11
-1
pkgs/development/compilers/ghdl/default.nix
+11
-1
pkgs/development/compilers/ghdl/default.nix
···
1
-
{ stdenv, fetchFromGitHub, gnat, zlib, llvm, lib
1
+
{ stdenv, fetchFromGitHub, callPackage, gnat, zlib, llvm, lib
2
2
, backend ? "mcode" }:
3
3
4
4
assert backend == "mcode" || backend == "llvm";
···
17
17
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
18
18
19
19
buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
20
+
propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ];
20
21
21
22
preConfigure = ''
22
23
# If llvm 7.0 works, 7.x releases should work too.
···
29
30
hardeningDisable = [ "format" ];
30
31
31
32
enableParallelBuilding = true;
33
+
34
+
passthru = {
35
+
# run with either of
36
+
# nix-build -A ghdl-mcode.passthru.tests
37
+
# nix-build -A ghdl-llvm.passthru.tests
38
+
tests = {
39
+
simple = callPackage ./test-simple.nix { inherit backend; };
40
+
};
41
+
};
32
42
33
43
meta = with lib; {
34
44
homepage = "https://github.com/ghdl/ghdl";
+8
pkgs/development/compilers/ghdl/expected-output.txt
+8
pkgs/development/compilers/ghdl/expected-output.txt
···
1
+
simple-tb.vhd:71:5:@700ms:(report note): 32
2
+
simple-tb.vhd:71:5:@900ms:(report note): 78
3
+
simple-tb.vhd:71:5:@1100ms:(report note): 105
4
+
simple-tb.vhd:71:5:@1300ms:(report note): 120
5
+
simple-tb.vhd:71:5:@1500ms:(report note): 79
6
+
simple-tb.vhd:71:5:@1700ms:(report note): 83
7
+
simple-tb.vhd:71:5:@1900ms:(report note): 32
8
+
simple-tb.vhd:75:1:@2100ms:(report note): All tests passed.
+78
pkgs/development/compilers/ghdl/simple-tb.vhd
+78
pkgs/development/compilers/ghdl/simple-tb.vhd
···
1
+
library ieee;
2
+
use IEEE.STD_LOGIC_1164.all;
3
+
use ieee.numeric_std.all;
4
+
5
+
library STD;
6
+
use STD.textio.all;
7
+
8
+
entity tb is
9
+
end tb;
10
+
11
+
architecture beh of tb is
12
+
13
+
component simple
14
+
port (
15
+
CLK, RESET : in std_ulogic;
16
+
DATA_OUT : out std_ulogic_vector(7 downto 0);
17
+
DONE_OUT : out std_ulogic
18
+
);
19
+
end component;
20
+
21
+
signal data : std_ulogic_vector(7 downto 0) := "00100000";
22
+
signal clk : std_ulogic;
23
+
signal RESET : std_ulogic := '0';
24
+
signal done : std_ulogic := '0';
25
+
signal cyclecount : integer := 0;
26
+
27
+
constant cycle_time_c : time := 200 ms;
28
+
constant maxcycles : integer := 100;
29
+
30
+
begin
31
+
32
+
simple1 : simple
33
+
port map (
34
+
CLK => clk,
35
+
RESET => RESET,
36
+
DATA_OUT => data,
37
+
DONE_OUT => done
38
+
);
39
+
40
+
clk_process : process
41
+
begin
42
+
clk <= '0';
43
+
wait for cycle_time_c/2;
44
+
clk <= '1';
45
+
wait for cycle_time_c/2;
46
+
end process;
47
+
48
+
count_process : process(CLK)
49
+
begin
50
+
if (CLK'event and CLK ='1') then
51
+
if (RESET = '1') then
52
+
cyclecount <= 0;
53
+
else
54
+
cyclecount <= cyclecount + 1;
55
+
end if;
56
+
end if;
57
+
end process;
58
+
59
+
test : process
60
+
61
+
begin
62
+
63
+
RESET <= '1';
64
+
wait until (clk'event and clk='1');
65
+
wait until (clk'event and clk='1');
66
+
RESET <= '0';
67
+
wait until (clk'event and clk='1');
68
+
for cyclecnt in 1 to maxcycles loop
69
+
exit when done = '1';
70
+
wait until (clk'event and clk='1');
71
+
report integer'image(to_integer(unsigned(data)));
72
+
end loop;
73
+
wait until (clk'event and clk='1');
74
+
75
+
report "All tests passed." severity NOTE;
76
+
wait;
77
+
end process;
78
+
end beh;
+45
pkgs/development/compilers/ghdl/simple.vhd
+45
pkgs/development/compilers/ghdl/simple.vhd
···
1
+
library IEEE;
2
+
use IEEE.STD_LOGIC_1164.all;
3
+
use IEEE.NUMERIC_STD.ALL;
4
+
use IEEE.STD_LOGIC_MISC.or_reduce;
5
+
6
+
entity simple is
7
+
8
+
port (
9
+
CLK, RESET : in std_ulogic;
10
+
DATA_OUT : out std_ulogic_vector(7 downto 0);
11
+
DONE_OUT : out std_ulogic
12
+
);
13
+
end simple;
14
+
15
+
architecture beh of simple is
16
+
17
+
signal data : std_ulogic_vector(7 downto 0);
18
+
signal done: std_ulogic;
19
+
20
+
begin
21
+
22
+
proc_ctr : process(CLK)
23
+
begin
24
+
if (CLK = '1' and CLK'event) then
25
+
if (RESET = '1') then
26
+
data <= "01011111";
27
+
done <= '0';
28
+
else
29
+
case data is
30
+
when "00100000" => data <= "01001110";
31
+
when "01001110" => data <= "01101001";
32
+
when "01101001" => data <= "01111000";
33
+
when "01111000" => data <= "01001111";
34
+
when "01001111" => data <= "01010011";
35
+
when others => data <= "00100000";
36
+
end case;
37
+
done <= not or_reduce(data xor "01010011");
38
+
end if;
39
+
end if;
40
+
end process;
41
+
42
+
DATA_OUT <= data;
43
+
DONE_OUT <= done;
44
+
45
+
end beh;
+23
pkgs/development/compilers/ghdl/test-simple.nix
+23
pkgs/development/compilers/ghdl/test-simple.nix
···
1
+
{ stdenv, ghdl-llvm, ghdl-mcode, backend }:
2
+
3
+
let
4
+
ghdl = if backend == "llvm" then ghdl-llvm else ghdl-mcode;
5
+
in
6
+
stdenv.mkDerivation {
7
+
name = "ghdl-test-simple";
8
+
meta.timeout = 300;
9
+
nativeBuildInputs = [ ghdl ];
10
+
buildCommand = ''
11
+
cp ${./simple.vhd} simple.vhd
12
+
cp ${./simple-tb.vhd} simple-tb.vhd
13
+
mkdir -p ghdlwork
14
+
ghdl -a --workdir=ghdlwork --ieee=synopsys simple.vhd simple-tb.vhd
15
+
ghdl -e --workdir=ghdlwork --ieee=synopsys -o sim-simple tb
16
+
'' + (if backend == "llvm" then ''
17
+
./sim-simple --assert-level=warning > output.txt
18
+
'' else ''
19
+
ghdl -r --workdir=ghdlwork --ieee=synopsys tb > output.txt
20
+
'') + ''
21
+
diff output.txt ${./expected-output.txt} && touch $out
22
+
'';
23
+
}
+60
pkgs/development/python-modules/clevercsv/default.nix
+60
pkgs/development/python-modules/clevercsv/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchFromGitHub
4
+
, chardet
5
+
, cleo
6
+
, clikit
7
+
, pandas
8
+
, regex
9
+
, tabview
10
+
, python
11
+
}:
12
+
13
+
buildPythonPackage rec {
14
+
pname = "clevercsv";
15
+
version = "0.6.7";
16
+
format = "setuptools";
17
+
18
+
src = fetchFromGitHub {
19
+
owner = "alan-turing-institute";
20
+
repo = "CleverCSV";
21
+
rev = "v${version}";
22
+
sha256 = "0j3959bji48pkp0vnk7yls5l75ywjl77jdkvzs62n5mi5lky88p9";
23
+
};
24
+
25
+
propagatedBuildInputs = [
26
+
chardet
27
+
cleo
28
+
clikit
29
+
pandas
30
+
regex
31
+
tabview
32
+
];
33
+
34
+
pythonImportsCheck = [
35
+
"clevercsv"
36
+
"clevercsv.cparser"
37
+
];
38
+
39
+
checkPhase = ''
40
+
# by linking the installed version the tests also have access to compiled native libraries
41
+
rm -r clevercsv
42
+
ln -s $out/${python.sitePackages}/clevercsv/ clevercsv
43
+
# their ci only runs unit tests, there are also integration and fuzzing tests
44
+
${python.interpreter} -m unittest discover -v -f -s ./tests/test_unit
45
+
'';
46
+
47
+
meta = with lib; {
48
+
description = "CleverCSV is a Python package for handling messy CSV files";
49
+
longDescription = ''
50
+
CleverCSV is a Python package for handling messy CSV files. It provides
51
+
a drop-in replacement for the builtin CSV module with improved dialect
52
+
detection, and comes with a handy command line application for working
53
+
with CSV files.
54
+
'';
55
+
homepage = "https://github.com/alan-turing-institute/CleverCSV";
56
+
changelog = "https://github.com/alan-turing-institute/CleverCSV/blob/master/CHANGELOG.md";
57
+
license = licenses.mit;
58
+
maintainers = with maintainers; [ hexa ];
59
+
};
60
+
}
+25
-16
pkgs/development/python-modules/deepdiff/default.nix
+25
-16
pkgs/development/python-modules/deepdiff/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
-
, fetchPypi
4
-
, mock
3
+
, fetchFromGitHub
4
+
, click
5
+
, ordered-set
6
+
, clevercsv
5
7
, jsonpickle
6
-
, mmh3
7
-
, ordered-set
8
8
, numpy
9
9
, pytestCheckHook
10
+
, pyyaml
10
11
}:
11
12
12
13
buildPythonPackage rec {
13
14
pname = "deepdiff";
14
-
version = "5.2.3";
15
+
version = "5.3.0";
16
+
format = "setuptools";
15
17
16
-
src = fetchPypi {
17
-
inherit pname version;
18
-
sha256 = "ae2cb98353309f93fbfdda4d77adb08fb303314d836bb6eac3d02ed71a10b40e";
18
+
# pypi source does not contain all fixtures required for tests
19
+
src = fetchFromGitHub {
20
+
owner = "seperman";
21
+
repo = "deepdiff";
22
+
rev = version;
23
+
sha256 = "1izw2qpd93nj948zakamjn7q7dlmmr7sapg0c65hxvs0nmij8sl4";
19
24
};
20
25
21
-
# # Extra packages (may not be necessary)
22
-
checkInputs = [
23
-
mock
24
-
numpy
25
-
pytestCheckHook
26
+
propagatedBuildInputs = [
27
+
click
28
+
ordered-set
26
29
];
27
30
28
-
propagatedBuildInputs = [
31
+
pythonImportsCheck = [
32
+
"deepdiff"
33
+
];
34
+
35
+
checkInputs = [
36
+
clevercsv
29
37
jsonpickle
30
-
mmh3
31
-
ordered-set
38
+
numpy
39
+
pytestCheckHook
40
+
pyyaml
32
41
];
33
42
34
43
meta = with lib; {
+31
pkgs/development/python-modules/tabview/default.nix
+31
pkgs/development/python-modules/tabview/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchFromGitHub
4
+
, python
5
+
}:
6
+
7
+
buildPythonPackage rec {
8
+
pname = "tabview";
9
+
version = "1.4.4";
10
+
format = "setuptools";
11
+
12
+
# newest release only available as wheel on pypi
13
+
src = fetchFromGitHub {
14
+
owner = "TabViewer";
15
+
repo = "tabview";
16
+
rev = version;
17
+
sha256 = "1d1l8fhdn3w2zg7wakvlmjmgjh9lh9h5fal1clgyiqmhfix4cn4m";
18
+
};
19
+
20
+
checkPhase = ''
21
+
${python.interpreter} -m unittest discover
22
+
'';
23
+
24
+
meta = with lib; {
25
+
description = "Python curses command line CSV and tabular data viewer";
26
+
homepage = "https://github.com/TabViewer/tabview";
27
+
changelog = "https://github.com/TabViewer/tabview/blob/main/CHANGELOG.rst";
28
+
license = licenses.mit;
29
+
maintainers = with maintainers; [ hexa ];
30
+
};
31
+
}
+2
-2
pkgs/tools/graphics/grim/default.nix
+2
-2
pkgs/tools/graphics/grim/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "grim";
5
-
version = "1.3.1";
5
+
version = "1.3.2";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "emersion";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib";
11
+
sha256 = "sha256-71dmYENfPX8YHcTlR2F67EheoewicePMKm9/wPbmj9A=";
12
12
};
13
13
14
14
nativeBuildInputs = [
+29
pkgs/tools/misc/macchina/default.nix
+29
pkgs/tools/misc/macchina/default.nix
···
1
+
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
2
+
3
+
rustPlatform.buildRustPackage rec {
4
+
pname = "macchina";
5
+
version = "0.6.9";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "Macchina-CLI";
9
+
repo = pname;
10
+
rev = "v${version}";
11
+
sha256 = "sha256-y23gpYDnYoiTJcNyWKslVenPTXcCrOvxq+0N9PjQN3g=";
12
+
};
13
+
14
+
cargoSha256 = "sha256-jfLj8kLBG6AeeYo421JCl1bMqWwOGiwQgv7AEomtFcY=";
15
+
16
+
nativeBuildInputs = [ installShellFiles ];
17
+
18
+
postInstall = ''
19
+
installShellCompletion target/completions/*.{bash,fish}
20
+
'';
21
+
22
+
meta = with lib; {
23
+
description = "A fast, minimal and customizable system information fetcher";
24
+
homepage = "https://github.com/Macchina-CLI/macchina";
25
+
changelog = "https://github.com/Macchina-CLI/macchina/releases/tag/v${version}";
26
+
license = with licenses; [ mit ];
27
+
maintainers = with maintainers; [ _414owen ];
28
+
};
29
+
}
+3
-3
pkgs/tools/misc/watchexec/default.nix
+3
-3
pkgs/tools/misc/watchexec/default.nix
···
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "watchexec";
5
-
version = "1.15.0";
5
+
version = "1.15.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = pname;
9
9
repo = pname;
10
10
rev = version;
11
-
sha256 = "1b0ds04q4g8xcgwkziwb5hsi7v73w9y0prvhxz880zzh930652n2";
11
+
sha256 = "1xznhfljvsvc0ykv5h1wg31n93v96lvhbxfhavxivq3b0xh5vxrw";
12
12
};
13
13
14
-
cargoSha256 = "0jpfgyz5l4fdb5cnqmadzjzrvc6dwgray4b0mx80pghpjw8a8qfb";
14
+
cargoSha256 = "00dampnsnpzmchjcn0j5zslx17i0qgrv99gq772n0683m1l2lfq3";
15
15
16
16
nativeBuildInputs = [ installShellFiles ];
17
17
+2
-2
pkgs/tools/security/tor/default.nix
+2
-2
pkgs/tools/security/tor/default.nix
···
30
30
in
31
31
stdenv.mkDerivation rec {
32
32
pname = "tor";
33
-
version = "0.4.5.6";
33
+
version = "0.4.5.7";
34
34
35
35
src = fetchurl {
36
36
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
37
-
sha256 = "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2";
37
+
sha256 = "0x7hhl0svfc4yh9xvq7kkzgmwjcw1ak9i0794wjg4biy2fmclzs4";
38
38
};
39
39
40
40
outputs = [ "out" "geoip" ];
+2
-2
pkgs/tools/wayland/slurp/default.nix
+2
-2
pkgs/tools/wayland/slurp/default.nix
···
13
13
14
14
stdenv.mkDerivation rec {
15
15
pname = "slurp";
16
-
version = "1.3.1";
16
+
version = "1.3.2";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "emersion";
20
20
repo = "slurp";
21
21
rev = "v${version}";
22
-
sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv";
22
+
sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE=";
23
23
};
24
24
25
25
nativeBuildInputs = [
+8
pkgs/top-level/all-packages.nix
+8
pkgs/top-level/all-packages.nix
···
2017
2017
2018
2018
clasp = callPackage ../tools/misc/clasp { };
2019
2019
2020
+
clevercsv = with python3Packages; toPythonApplication clevercsv;
2021
+
2020
2022
clevis = callPackage ../tools/security/clevis {
2021
2023
asciidoc = asciidoc-full;
2022
2024
};
···
6438
6440
6439
6441
macchanger = callPackage ../os-specific/linux/macchanger { };
6440
6442
6443
+
macchina = callPackage ../tools/misc/macchina { };
6444
+
6441
6445
madlang = haskell.lib.justStaticExecutables haskellPackages.madlang;
6442
6446
6443
6447
maeparser = callPackage ../development/libraries/maeparser { };
···
7503
7507
plexRaw = callPackage ../servers/plex/raw.nix { };
7504
7508
7505
7509
tab = callPackage ../tools/text/tab { };
7510
+
7511
+
tabview = with python3Packages; toPythonApplication tabview;
7506
7512
7507
7513
tautulli = python3Packages.callPackage ../servers/tautulli { };
7508
7514
···
28569
28575
conglomerate = callPackage ../applications/science/biology/conglomerate { };
28570
28576
28571
28577
dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
28578
+
28579
+
deepdiff = with python3Packages; toPythonApplication deepdiff;
28572
28580
28573
28581
deepsea = callPackage ../tools/security/deepsea { };
28574
28582
+4
pkgs/top-level/python-packages.nix
+4
pkgs/top-level/python-packages.nix
···
1343
1343
1344
1344
cleo = callPackage ../development/python-modules/cleo { };
1345
1345
1346
+
clevercsv = callPackage ../development/python-modules/clevercsv { };
1347
+
1346
1348
clf = callPackage ../development/python-modules/clf { };
1347
1349
1348
1350
click = callPackage ../development/python-modules/click { };
···
7688
7690
tablib = callPackage ../development/python-modules/tablib { };
7689
7691
7690
7692
tabulate = callPackage ../development/python-modules/tabulate { };
7693
+
7694
+
tabview = callPackage ../development/python-modules/tabview { };
7691
7695
7692
7696
tadasets = callPackage ../development/python-modules/tadasets { };
7693
7697