git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit2bc8eed5b92a27a361553dbabc81c2ffb56971f0 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateThu 6 Jan 2022, 12:01 (5 years ago) parent8a0e1297a3a681
15 files changed+139−72
nixos/modules/installer/tools/nixos-install.sh+17−17 pkgs/applications/editors/em/default.nix+29 pkgs/applications/misc/copyq/default.nix+2−11 pkgs/applications/version-management/mercurial/default.nix+38−3 pkgs/desktops/enlightenment/efl/default.nix+2−2 pkgs/desktops/enlightenment/terminology/default.nix+3−9 pkgs/development/libraries/wolfssl/default.nix+2−2 pkgs/development/ocaml-modules/uunf/default.nix+2 pkgs/development/python-modules/filebrowser_safe/default.nix+13−11 pkgs/development/python-modules/limnoria/default.nix+2−2 pkgs/development/python-modules/parfive/default.nix+2−2 pkgs/development/python-modules/pysimplegui/default.nix+16−8 pkgs/development/python-modules/python-gitlab/default.nix+5−3 pkgs/development/tools/analysis/rizin/default.nix+2−2 pkgs/top-level/all-packages.nix+4
nixos/modules/installer/tools/nixos-install.sh+17−17
@@ -143,6 +143,23 @@ export TMPDIR=${TMPDIR:-$tmpdir}
143143
144144sub="auto?trusted=1"
145145
146+# Copy the NixOS/Nixpkgs sources to the target as the initial contents
147+# of the NixOS channel.
148+if [[ -z $noChannelCopy ]]; then
149+ if [[ -z $channelPath ]]; then
150+ channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
151+ fi
152+ if [[ -n $channelPath ]]; then
153+ echo "copying channel..."
154+ mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root
155+ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
156+ -p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
157+ "${verbosity[@]}"
158+ install -m 0700 -d "$mountPoint"/root/.nix-defexpr
159+ ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels
160+ fi
161+fi
162+
146163# Build the system configuration in the target filesystem.
147164if [[ -z $system ]]; then
148165 outLink="$tmpdir/system"
@@ -167,23 +184,6 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \
167184 --extra-substituters "$sub" \
168185 -p "$mountPoint"/nix/var/nix/profiles/system --set "$system" "${verbosity[@]}"
169186
170−# Copy the NixOS/Nixpkgs sources to the target as the initial contents
171−# of the NixOS channel.
172−if [[ -z $noChannelCopy ]]; then
173− if [[ -z $channelPath ]]; then
174− channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
175− fi
176− if [[ -n $channelPath ]]; then
177− echo "copying channel..."
178− mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root
179− nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
180− -p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
181− "${verbosity[@]}"
182− install -m 0700 -d "$mountPoint"/root/.nix-defexpr
183− ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels
184− fi
185−fi
186−
187187# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
188188mkdir -m 0755 -p "$mountPoint/etc"
189189touch "$mountPoint/etc/NIXOS"
pkgs/applications/editors/em/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ lib
2+, stdenv
3+, fetchurl
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "em";
8+ version = "1.0.0";
9+
10+ src = fetchurl {
11+ url = "http://pgas.freeshell.org/C/em/${pname}-${version}.tar.gz";
12+ hash = "sha256-ijMBkl7U1f9MTXgli9kUFB8ttMG6TMQnxfDMP9AblTQ=";
13+ };
14+
15+ meta = with lib; {
16+ homepage = "http://pgas.freeshell.org/C/em/";
17+ description = "Editor for Mortals";
18+ longDescription = ''
19+ Em is a QMC variant of the standard Unix text editor - ed. It includes all
20+ of ed, so the documentation for ed is fully applicable to em. Em also has
21+ a number of new commands and facilities designed to improve its
22+ interaction and increase its usefulness to users at fast vdu terminals
23+ (such as the ITT's at QMC).
24+ '';
25+ license = licenses.publicDomain;
26+ maintainers = with maintainers; [ AndersonTorres ];
27+ platforms = platforms.unix;
28+ };
29+}
pkgs/applications/misc/copyq/default.nix+2−11
@@ -17,13 +17,13 @@
1717
1818mkDerivation rec {
1919 pname = "CopyQ";
20− version = "4.1.0";
20+ version = "6.0.1";
2121
2222 src = fetchFromGitHub {
2323 owner = "hluk";
2424 repo = "CopyQ";
2525 rev = "v${version}";
26− sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
26+ sha256 = "sha256-edrRgnjbszqJLbGLE4anCJSGApymvK0O+2ks5jWe8aw=";
2727 };
2828
2929 nativeBuildInputs = [
@@ -42,15 +42,6 @@ mkDerivation rec {
4242 wayland
4343 ];
4444
45− patches = [
46− # Install the bash completion script correctly
47− # Remove once 4.1.1 is released
48− (fetchpatch {
49− url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch";
50− sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl";
51− })
52− ];
53−
5445 postPatch = ''
5546 substituteInPlace shared/com.github.hluk.copyq.desktop.in \
5647 --replace copyq "$out/bin/copyq"
pkgs/applications/version-management/mercurial/default.nix+38−3
@@ -6,6 +6,12 @@
66, guiSupport ? fullBuild, tk
77, highlightSupport ? fullBuild
88, ApplicationServices
9+# test dependencies
10+, unzip
11+, which
12+, sqlite
13+, git
14+, gnupg
915}:
1016
1117let
@@ -13,11 +19,11 @@ let
1319
1420 self = python3Packages.buildPythonApplication rec {
1521 pname = "mercurial";
16− version = "5.9.3";
22+ version = "6.0.1";
1723
1824 src = fetchurl {
1925 url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
20− sha256 = "sha256-O0P2iXetD6dap/HlyPCoO6k1YhqyOWEpq7SY5W0b4I4=";
26+ sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI=";
2127 };
2228
2329 format = "other";
@@ -27,11 +33,20 @@ let
2733 cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
2834 inherit src;
2935 name = "${pname}-${version}";
30− sha256 = "sha256:1d911jaawdrcv2mdhlp2ylr10791zj7dhb69aiw5yy7vn7gry82n";
36+ sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs=";
3137 sourceRoot = "${pname}-${version}/rust";
3238 } else null;
3339 cargoRoot = if rustSupport then "rust" else null;
3440
41+ postPatch = ''
42+ patchShebangs .
43+
44+ for f in **/*.{py,c,t}; do
45+ # not only used in shebangs
46+ substituteAllInPlace "$f" '/bin/sh' '${stdenv.shell}'
47+ done
48+ '';
49+
3550 propagatedBuildInputs = lib.optional re2Support fb-re2
3651 ++ lib.optional gitSupport pygit2
3752 ++ lib.optional highlightSupport pygments;
@@ -47,6 +62,26 @@ let
4762 makeFlags = [ "PREFIX=$(out)" ]
4863 ++ lib.optional rustSupport "PURE=--rust";
4964
65+ doCheck = stdenv.isLinux; # tests seem unstable on Darwin
66+ checkInputs = [
67+ unzip
68+ which
69+ sqlite
70+ git
71+ gnupg
72+ ];
73+ checkPhase = ''
74+ cat << EOF > tests/blacklists/nix
75+ # tests enforcing "/usr/bin/env" shebangs, which are patched for nix
76+ test-run-tests.t
77+ test-check-shbang.t
78+ EOF
79+
80+ # extended timeout necessary for tests to pass on the busy CI workers
81+ export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600"
82+ make check
83+ '';
84+
5085 postInstall = (lib.optionalString guiSupport ''
5186 mkdir -p $out/etc/mercurial
5287 cp contrib/hgk $out/bin
pkgs/desktops/enlightenment/efl/default.nix+2−2
@@ -56,11 +56,11 @@
5656
5757stdenv.mkDerivation rec {
5858 pname = "efl";
59− version = "1.26.0";
59+ version = "1.26.1";
6060
6161 src = fetchurl {
6262 url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
63− sha256 = "0k10mwpdjn57r2kflbzpybhvwl25yqqa2i2fhx0qazyjbzjbrad4";
63+ sha256 = "0hm6i1f2g4mwj726rc6na38xhys1plbv9swrlc9hrpa87mz6gac6";
6464 };
6565
6666 nativeBuildInputs = [
pkgs/desktops/enlightenment/terminology/default.nix+3−9
@@ -1,12 +1,12 @@
1−{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }:
1+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }:
22
33stdenv.mkDerivation rec {
44 pname = "terminology";
5− version = "1.11.0";
5+ version = "1.12.1";
66
77 src = fetchurl {
88 url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
9− sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g";
9+ sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq";
1010 };
1111
1212 nativeBuildInputs = [
@@ -18,12 +18,6 @@ stdenv.mkDerivation rec {
1818
1919 buildInputs = [
2020 efl
21− pcre
22− mesa
23− ];
24−
25− mesonFlags = [
26− "-D edje-cc=${efl}/bin/edje_cc"
2721 ];
2822
2923 postPatch = ''
pkgs/development/libraries/wolfssl/default.nix+2−2
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 pname = "wolfssl";
9− version = "5.1.0";
9+ version = "5.1.1";
1010
1111 src = fetchFromGitHub {
1212 owner = "wolfSSL";
1313 repo = "wolfssl";
1414 rev = "v${version}-stable";
15− sha256 = "sha256-PkuYXDL04LbUiY+O/4EilZn2+hTbwbRXPDE3B5d/4pQ=";
15+ sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw=";
1616 };
1717
1818 # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
pkgs/development/ocaml-modules/uunf/default.nix+2
@@ -22,6 +22,8 @@ stdenv.mkDerivation {
2222
2323 propagatedBuildInputs = [ uchar ];
2424
25+ prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";
26+
2527 inherit (topkg) buildPhase installPhase;
2628
2729 meta = with lib; {
pkgs/development/python-modules/filebrowser_safe/default.nix+13−11
@@ -2,18 +2,25 @@
22, buildPythonPackage
33, fetchPypi
44, django
5+, pythonOlder
56}:
67
78buildPythonPackage rec {
8− version = "1.1.0";
9− pname = "filebrowser_safe";
9+ pname = "filebrowser-safe";
10+ version = "1.1.1";
11+ format = "setuptools";
12+
13+ disabled = pythonOlder "3.6";
1014
1115 src = fetchPypi {
12− inherit pname version;
13− sha256 = "14b6e0af9697f1d0f08508cc88bc8459273cd6453636cebe8504dccc80e926e4";
16+ pname = "filebrowser_safe";
17+ inherit version;
18+ sha256 = "499c5dbd9e112dfc436cae7713b2fb664a59015021f6c9d131e3b7980aeb5c94";
1419 };
1520
16− buildInputs = [ django ];
21+ buildInputs = [
22+ django
23+ ];
1724
1825 # There is no test embedded
1926 doCheck = false;
@@ -24,15 +31,10 @@ buildPythonPackage rec {
2431 filebrowser_safe was created to provide a snapshot of the
2532 FileBrowser asset manager for Django, to be referenced as a
2633 dependency for the Mezzanine CMS for Django.
27−
28− At the time of filebrowser_safe's creation, FileBrowser was
29− incorrectly packaged on PyPI, and had also dropped compatibility
30− with Django 1.1 - filebrowser_safe was therefore created to
31− address these specific issues.
3234 '';
3335 homepage = "https://github.com/stephenmcd/filebrowser-safe";
3436 downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/";
35− license = licenses.free;
37+ license = licenses.bsd3;
3638 maintainers = with maintainers; [ prikhi ];
3739 platforms = platforms.unix;
3840 };
pkgs/development/python-modules/limnoria/default.nix+2−2
@@ -15,14 +15,14 @@
1515
1616buildPythonPackage rec {
1717 pname = "limnoria";
18− version = "2022.1.1";
18+ version = "2022.1.1.post1";
1919 format = "setuptools";
2020
2121 disabled = pythonOlder "3.6";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− hash = "sha256-tJqUsNRvSipuvOTfxJOFUCojrkRrrrzIgEYNShrTP8c=";
25+ hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U=";
2626 };
2727
2828 propagatedBuildInputs = [
pkgs/development/python-modules/parfive/default.nix+2−2
@@ -15,14 +15,14 @@
1515
1616buildPythonPackage rec {
1717 pname = "parfive";
18− version = "1.5.0";
18+ version = "1.5.1";
1919 format = "setuptools";
2020
2121 disabled = pythonOlder "3.7";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "f36128e8a93f3494ce3de8af883eeba4bd651ab228682810a46ec4b7897a84b3";
25+ sha256 = "c411fd7269a49d1c72a964e97de474ec082115777b363aeed98a6595f90b8676";
2626 };
2727
2828 buildInputs = [
pkgs/development/python-modules/pysimplegui/default.nix+16−8
@@ -2,26 +2,34 @@
22, buildPythonPackage
33, fetchPypi
44, tkinter
5+, pythonOlder
56}:
7+
68buildPythonPackage rec {
7− pname = "PySimpleGUI";
8− version = "4.55.1";
9+ pname = "pysimplegui";
10+ version = "4.56.0";
11+ format = "setuptools";
12+
13+ disabled = pythonOlder "3.6";
914
1015 src = fetchPypi {
11− inherit pname version;
12− sha256 = "sha256-nUDAoMK0w9Luk1hU5I1yT1CK5oEj9LrIByYS3Z5wfew=";
16+ pname = "PySimpleGUI";
17+ inherit version;
18+ sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5";
1319 };
1420
15− pythonImportsCheck = [ "PySimpleGUI" ];
16−
1721 propagatedBuildInputs = [
1822 tkinter
1923 ];
2024
25+ pythonImportsCheck = [
26+ "PySimpleGUI"
27+ ];
28+
2129 meta = with lib; {
22− description = "Python GUIs for Humans.";
30+ description = "Python GUIs for Humans";
2331 homepage = "https://github.com/PySimpleGUI/PySimpleGUI";
24− license = licenses.gpl3;
32+ license = licenses.lgpl3Plus;
2533 maintainers = with maintainers; [ lucasew ];
2634 };
2735}
pkgs/development/python-modules/python-gitlab/default.nix+5−3
@@ -10,12 +10,14 @@
1010
1111buildPythonPackage rec {
1212 pname = "python-gitlab";
13− version = "2.10.1";
14− disabled = pythonOlder "3.6";
13+ version = "3.0.0";
14+ format = "setuptools";
15+
16+ disabled = pythonOlder "3.7";
1517
1618 src = fetchPypi {
1719 inherit pname version;
18− sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f";
20+ sha256 = "89f82740b76820cf407cee9c43b75ca3ddb72f344f595902ee963837d7664986";
1921 };
2022
2123 propagatedBuildInputs = [
pkgs/development/tools/analysis/rizin/default.nix+2−2
@@ -23,11 +23,11 @@
2323
2424stdenv.mkDerivation rec {
2525 pname = "rizin";
26− version = "0.3.1";
26+ version = "0.3.2";
2727
2828 src = fetchurl {
2929 url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
30− sha256 = "sha256-muS3+cR75jZl/Q5ZN1srEPg8NxVquwRMpNYcHw/Ij34=";
30+ sha256 = "sha256-T65gm1tfRD7dZSL8qZKMTAbQ65Lx/ecidFc9T1b7cig=";
3131 };
3232
3333 mesonFlags = [
pkgs/top-level/all-packages.nix+4
@@ -7716,6 +7716,8 @@ with pkgs;
77167716 guile = guile_1_8;
77177717 };
77187718
7719+ mcstatus = with python3Packages; toPythonApplication mcstatus;
7720+
77197721 mdbtools = callPackage ../tools/misc/mdbtools { };
77207722
77217723 mdk = callPackage ../development/tools/mdk { };
@@ -25037,6 +25039,8 @@ with pkgs;
2503725039
2503825040 elvis = callPackage ../applications/editors/elvis { };
2503925041
25042+ em = callPackage ../applications/editors/em { };
25043+
2504025044 emacs = emacs27;
2504125045 emacs-nox = emacs27-nox;
2504225046