From f453cea72410fb14c6cdda95eecd22d7d2ca81a7 Mon Sep 17 00:00:00 2001 From: Leandro Reina Date: Sat, 9 Sep 2023 20:49:21 +0200 Subject: [PATCH 01/27] python311Packages.libpcap: init at 1.11.0b7 --- .../python-modules/libpcap/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 ++++-- 2 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/libpcap/default.nix diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix new file mode 100644 index 000000000000..1dbc2de90dfb --- /dev/null +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, dbus +, pkgsLibpcap +, pkg-about +, setuptools +, tox +}: + +buildPythonPackage rec { + pname = "libpcap"; + version = "1.11.0b7"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + hash = "sha256-gEWFqmeOJTVHdjcSOxfVLZtrNSO3CTY1L2VcXOu7q7k="; + }; + + nativeBuildInputs = [ + setuptools + tox + ]; + + postPatch = '' + cat <src/libpcap/libpcap.cfg + [libpcap] + LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} + EOF + ''; + + propagatedBuildInputs = [ + dbus.lib + pkgsLibpcap + pkg-about + ]; + + # Project has tests, but I can't get them to run even outside of nix + doCheck = false; + + pythonImportsCheck = [ + "libpcap" + ]; + + meta = with lib; { + description = "Python binding for the libpcap C library"; + longDescription = '' + Python libpcap module is a low-level binding for libpcap C library. + + It is an effort to allow python programs full access to the API provided by the well known libpcap Unix C library and by its implementations provided under Win32 systems by such packet capture systems as: Npcap, WinPcap + + libpcap is a lightweight Python package, based on the ctypes library. + + It is fully compliant implementation of the original C libpcap from 1.0.0 up to 1.9.0 API and the WinPcap’s 4.1.3 libpcap (1.0.0rel0b) API by implementing whole its functionality in a clean Python instead of C. + ''; + homepage = "https://github.com/karpierz/libpcap/"; + license = licenses.bsd3; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef716ba704ee..3b3d005a6dda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5989,6 +5989,10 @@ self: super: with self; { inherit (pkgs) libsodium; }; + libpcap = callPackage ../development/python-modules/libpcap { + pkgsLibpcap = pkgs.libpcap; # Needs the C library + }; + libpurecool = callPackage ../development/python-modules/libpurecool { }; libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; @@ -7860,7 +7864,9 @@ self: super: with self; { pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - pcapy-ng = callPackage ../development/python-modules/pcapy-ng { }; + pcapy-ng = callPackage ../development/python-modules/pcapy-ng { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; pcodedmp = callPackage ../development/python-modules/pcodedmp { }; @@ -8962,7 +8968,9 @@ self: super: with self; { pydes = callPackage ../development/python-modules/pydes { }; - py-desmume = callPackage ../development/python-modules/py-desmume { }; + py-desmume = callPackage ../development/python-modules/py-desmume { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; pydevccu = callPackage ../development/python-modules/pydevccu { }; @@ -9613,7 +9621,9 @@ self: super: with self; { pypca = callPackage ../development/python-modules/pypca { }; - pypcap = callPackage ../development/python-modules/pypcap { }; + pypcap = callPackage ../development/python-modules/pypcap { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; pypck = callPackage ../development/python-modules/pypck { }; @@ -11484,7 +11494,9 @@ self: super: with self; { scancode-toolkit = callPackage ../development/python-modules/scancode-toolkit { }; - scapy = callPackage ../development/python-modules/scapy { }; + scapy = callPackage ../development/python-modules/scapy { + inherit (pkgs) libpcap; # Avoid confusion with python package of the same name + }; schedule = callPackage ../development/python-modules/schedule { }; From 6be969daf178f7f2fbaff57a9326e79020115d7f Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 11 Sep 2023 10:00:22 -0700 Subject: [PATCH 02/27] xorg: add meta.mainProgram to various utilities See #246386 --- pkgs/servers/x11/xorg/overrides.nix | 102 +++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2d15d5ea722a..2c168a659a89 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -18,6 +18,10 @@ let (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; + addMainProgram = pkg: { mainProgram ? pkg.pname }: pkg.overrideAttrs (attrs: { + meta = attrs.meta // { inherit mainProgram; }; + }); + brokenOnDarwin = pkg: pkg.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; }; }); @@ -42,12 +46,18 @@ self: super: postInstallHooks+=(wrapWithXFileSearchPath) '')) {}; + appres = addMainProgram super.appres { }; + bdftopcf = super.bdftopcf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; + meta = attrs.meta // { mainProgram = "bdftopcf"; }; }); + bitmap = addMainProgram super.bitmap { }; + editres = super.editres.overrideAttrs (attrs: { hardeningDisable = [ "format" ]; + meta = attrs.meta // { mainProgram = "editres"; }; }); fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { @@ -60,9 +70,16 @@ self: super: }); fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: { - meta = attrs.meta // { license = lib.licenses.mit; }; + meta = attrs.meta // { + license = lib.licenses.mit; + mainProgram = "fonttosfnt"; + }; }); + gccmakedep = addMainProgram super.gccmakedep { }; + iceauth = addMainProgram super.iceauth { }; + ico = addMainProgram super.ico { }; + imake = super.imake.overrideAttrs (attrs: { inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; @@ -75,6 +92,8 @@ self: super: configureFlags = attrs.configureFlags or [] ++ [ "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp" ]; inherit tradcpp; + + meta = attrs.meta // { mainProgram = "imake"; }; }); mkfontdir = xorg.mkfontscale; @@ -116,6 +135,8 @@ self: super: }; }); + libxcvt = addMainProgram super.libxcvt { mainProgram = "cvt"; }; + libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; configureFlags = attrs.configureFlags or [] @@ -193,6 +214,9 @@ self: super: configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); + + listres = addMainProgram super.listres { }; + xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: { configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; @@ -213,6 +237,7 @@ self: super: ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) # checking for /dev/urandom... configure: error: cannot check for file existence when cross compiling [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ]; + meta = attrs.meta // { mainProgram = "xdm"; }; }); # Propagate some build inputs because of header file dependencies. @@ -237,6 +262,7 @@ self: super: configureFlags = [ "--disable-selective-werror" ]; buildInputs = attrs.buildInputs ++ [libiconv]; + meta = attrs.meta // { mainProgram = "luit"; }; }); libICE = super.libICE.overrideAttrs (attrs: { @@ -359,6 +385,7 @@ self: super: outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; + meta = attrs.meta // { mainProgram = "sxpm"; }; }); libXpresent = super.libXpresent.overrideAttrs (attrs: { @@ -402,16 +429,28 @@ self: super: ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11 ln -sfn ${xorg.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7 ''; + meta = attrs.meta // { mainProgram = "setxkbmap"; }; }); + makedepend = addMainProgram super.makedepend { }; + mkfontscale = addMainProgram super.mkfontscale { }; + oclock = addMainProgram super.oclock { }; + smproxy = addMainProgram super.smproxy { }; + transset = addMainProgram super.transset { }; + utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ]; }); + viewres = addMainProgram super.viewres { }; + x11perf = super.x11perf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; + meta = attrs.meta // { mainProgram = "x11perf"; }; }); + xcalc = addMainProgram super.xcalc { }; + xcbutil = super.xcbutil.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; }); @@ -579,14 +618,20 @@ self: super: xdriinfo = super.xdriinfo.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [libGL]; + meta = attrs.meta // { mainProgram = "xdriinfo"; }; }); + xev = addMainProgram super.xev { }; + xeyes = addMainProgram super.xeyes { }; + xvinfo = super.xvinfo.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [xorg.libXext]; + meta = attrs.meta // { mainProgram = "xvinfo"; }; }); xkbcomp = super.xkbcomp.overrideAttrs (attrs: { configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; + meta = attrs.meta // { mainProgram = "xkbcomp"; }; }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { @@ -670,7 +715,10 @@ self: super: }); xlsfonts = super.xlsfonts.overrideAttrs (attrs: { - meta = attrs.meta // { license = lib.licenses.mit; }; + meta = attrs.meta // { + license = lib.licenses.mit; + mainProgram = "xlsfonts"; + }; }); xorgproto = super.xorgproto.overrideAttrs (attrs: { @@ -704,6 +752,7 @@ self: super: sed -i -e "s|#include |#include |" $i done ''; + meta = attrs_passed.meta // { mainProgram = "X"; }; } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; @@ -870,11 +919,12 @@ self: super: --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; - meta.mainProgram = "lndir"; + meta = attrs.meta // { mainProgram = "lndir"; }; }); twm = super.twm.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [bison flex]; + meta = attrs.meta // { mainProgram = "twm"; }; }); xauth = super.xauth.overrideAttrs (attrs: { @@ -884,8 +934,16 @@ self: super: + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" ''; + meta = attrs.meta // { mainProgram = "xauth"; }; }); + xbacklight = addMainProgram super.xbacklight { }; + xclock = addMainProgram super.xclock { }; + xcmsdb = addMainProgram super.xcmsdb { }; + xcompmgr = addMainProgram super.xcompmgr { }; + xconsole = addMainProgram super.xconsole { }; + xcursorgen = addMainProgram super.xcursorgen { }; + xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ]; buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; @@ -915,6 +973,7 @@ self: super: --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc \ --replace $out/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc ''; + meta = attrs.meta // { mainProgram = "xinit"; }; }); xf86videointel = super.xf86videointel.overrideAttrs (attrs: { @@ -971,6 +1030,25 @@ self: super: ]; }); + xfd = addMainProgram super.xfd { }; + xfontsel = addMainProgram super.xfontsel { }; + xfs = addMainProgram super.xfs { }; + xfsinfo = addMainProgram super.xfsinfo { }; + xgamma = addMainProgram super.xgamma { }; + xgc = addMainProgram super.xgc { }; + xhost = addMainProgram super.xhost { }; + xinput = addMainProgram super.xinput { }; + xkbevd = addMainProgram super.xkbevd { }; + xkbprint = addMainProgram super.xkbprint { }; + xkill = addMainProgram super.xkill { }; + xload = addMainProgram super.xload { }; + xlsatoms = addMainProgram super.xlsatoms { }; + xlsclients = addMainProgram super.xlsclients { }; + xmag = addMainProgram super.xmag { }; + xmessage = addMainProgram super.xmessage { }; + xmodmap = addMainProgram super.xmodmap { }; + xmore = addMainProgram super.xmore { }; + xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" @@ -983,12 +1061,17 @@ self: super: postInstall = "mkdir $out/bin"; }); + xpr = addMainProgram super.xpr { }; + xprop = addMainProgram super.xprop { }; + xrdb = super.xrdb.overrideAttrs (attrs: { configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; + meta = attrs.meta // { mainProgram = "xrdb"; }; }); sessreg = super.sessreg.overrideAttrs (attrs: { preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile"; + meta = attrs.meta // { mainProgram = "sessreg"; }; }); xrandr = super.xrandr.overrideAttrs (attrs: { @@ -1000,11 +1083,14 @@ self: super: }; }); - xset = super.xset.overrideAttrs (attrs: { - meta = attrs.meta // { - mainProgram = "xset"; - }; - }); + xrefresh = addMainProgram super.xrefresh { }; + xset = addMainProgram super.xset { }; + xsetroot = addMainProgram super.xsetroot { }; + xsm = addMainProgram super.xsm { }; + xstdcmap = addMainProgram super.xstdcmap { }; + xwd = addMainProgram super.xwd { }; + xwininfo = addMainProgram super.xwininfo { }; + xwud = addMainProgram super.xwud { }; # convert Type1 vector fonts to OpenType fonts fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { From fa7ea4f889cabf8fb449b3dd01aaa2249e7ef124 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Tue, 12 Sep 2023 16:53:27 +1000 Subject: [PATCH 03/27] scala_2_13: 2.13.11 -> 2.13.12 --- pkgs/development/compilers/scala/2.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index e9680553e017..6268fea658dd 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -24,8 +24,8 @@ let }; "2.13" = { - version = "2.13.11"; - sha256 = "YYLdgdICPM5SczPteFsaojqY6H3IVauji6SJLcaq8eM="; + version = "2.13.12"; + sha256 = "r+fm+1njyIRX6Z9wGHMOUvuifI0V49cVT3KWggbKhxk="; pname = "scala_2_13"; }; }; @@ -114,6 +114,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; branch = versions.majorMinor version; - maintainers = [ maintainers.nequissimus ]; + maintainers = with maintainers; [ nequissimus kashw2 ]; }; } From 8ff38d746d1236bf87aae3a8885fcbdd08e23d5d Mon Sep 17 00:00:00 2001 From: kashw2 Date: Tue, 12 Sep 2023 16:53:37 +1000 Subject: [PATCH 04/27] scala_3: 3.3.0 -> 3.3.1 --- pkgs/development/compilers/scala/bare.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/scala/bare.nix b/pkgs/development/compilers/scala/bare.nix index 33095a49b829..09180e54a5a5 100644 --- a/pkgs/development/compilers/scala/bare.nix +++ b/pkgs/development/compilers/scala/bare.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "3.3.0"; + version = "3.3.1"; pname = "scala-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; - hash = "sha256-Bk7lCKjjucaYQxAsg2qomJQUgCK/N688JqlGTfoQFHU="; + hash = "sha256-EcDqD3HEOvD7GzVd3kFL/vAaYMFyk2deI6RNAlJpzRU="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "http://dotty.epfl.ch/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = [maintainers.karolchmist maintainers.virusdave]; + maintainers = with maintainers; [ karolchmist virusdave kashw2 ]; }; } From d8119659d4e4f57e5dd0c0be700354d10f64cb21 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 12 Sep 2023 20:22:06 +0200 Subject: [PATCH 05/27] musikcube: 3.0.1 -> 3.0.2 remove with lib --- pkgs/applications/audio/musikcube/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 9c6c8d30f4c5..531d2851261b 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - hash = "sha512-ahKPmChHRVpOQcgt0fOYumlsMApeN4MWwywE9F0edeN0Xr3Vp830mWGzEBJvMvGI/lnU/1rd7tREaHfm1vCJaw=="; + hash = "sha512-IakZy6XsAE39awjzQI+R11JCPeQSaibx6+uX8Iea5WdlCundeovnPwSAi6RzzZl9dr2UftzzEiF4Aun8VMtqVA=="; }; outputs = [ "out" "dev" ]; @@ -85,11 +85,11 @@ stdenv.mkDerivation rec { install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d ''; - meta = with lib; { + meta = { description = "Terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; - maintainers = with maintainers; [ aanderse srapenne afh ]; - license = licenses.bsd3; - platforms = platforms.all; + maintainers = with lib.maintainers; [ aanderse srapenne afh ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } From 4f461f7b7788d9aafc6021f1384423dabe605ad0 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 13 Sep 2023 11:49:16 +0200 Subject: [PATCH 06/27] nixos/modules/system/resolved: disable DNSSEC validation by default Historically, we allowed downgrade of DNSSEC, but some folks argue this may decrease actually the security posture to do opportunistic DNSSEC. In addition, the current implementation of (opportunistic) DNSSEC validation is broken against "in the wild" servers which are usually slightly non-compliant. systemd upstream recommended to me (in personal communication surrounding the All Systems Go 2023 conference) to disable DNSSEC validation until they work on it in a significant capacity, ideally, by next year. --- nixos/modules/system/boot/resolved.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 4e7201833db6..b898a6317962 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -66,7 +66,7 @@ in }; services.resolved.dnssec = mkOption { - default = "allow-downgrade"; + default = "false"; example = "true"; type = types.enum [ "true" "allow-downgrade" "false" ]; description = lib.mdDoc '' @@ -85,6 +85,12 @@ in synthesizing a DNS response that suggests DNSSEC was not supported. - `"false"`: DNS lookups are not DNSSEC validated. + + At the time of September 2023, systemd upstream advise + to disable DNSSEC by default as the current code + is not robust enough to deal with "in the wild" non-compliant + servers, which will usually give you a broken bad experience + in addition of insecure. ''; }; From a8a93eb30f30102d1f71e8b5e8b8a0e6057cf55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 12:58:37 -0700 Subject: [PATCH 07/27] gdal: 3.7.1 -> 3.7.2 Diff: https://github.com/OSGeo/gdal/compare/v3.7.1...v3.7.2 Changelog: https://github.com/OSGeo/gdal/blob/v3.7.2/NEWS.md --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 36a49ad038f5..e23eb42d33e8 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-RXX21tCq0xJQli3NTertM9IweONrJfGeaFj3utMFjpM="; + hash = "sha256-/7Egbg4Cg5Gqsy+CEMVbs2NCWbdJteDNWelBsrQSUj4="; }; nativeBuildInputs = [ From 9abe8e8ea26d60a3488e3699b402dd0e02eb96d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 13:37:43 -0700 Subject: [PATCH 08/27] celeste: 0.5.2 -> 0.5.8 Diff: https://github.com/hwittenborn/celeste/compare/v0.5.2...v0.5.8 Changelog: https://github.com/hwittenborn/celeste/blob/v0.5.8/CHANGELOG.md --- .../networking/sync/celeste/default.nix | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 0e0b36263831..d7a83967450f 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -4,7 +4,6 @@ , rustPlatform , fetchFromGitHub , substituteAll -, fetchpatch , pkg-config , wrapGAppsHook4 , cairo @@ -20,25 +19,18 @@ , rclone }: -let - # https://github.com/trevyn/librclone/pull/8 - librclone-mismatched-types-patch = fetchpatch { - name = "use-c_char-to-be-platform-independent.patch"; - url = "https://github.com/trevyn/librclone/commit/91fdf3fa5f5eea0dfd06981ba72e09034974fdad.patch"; - hash = "sha256-8YDyUNP/ISP5jCliT6UCxZ89fdRFud+6u6P29XdPy58="; - }; -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.5.2"; + version = "0.5.8"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-pFtyfKGPlwum/twGXi/e82BjINy6/MMvvmVfrwWHTQg="; + hash = "sha256-U/6aqQig+uuWj/B9CODnV6chxY+KfMH7DqnPtSTDSA0="; }; - cargoHash = "sha256-wcgu4KApkn68Tpk3PQ9Tkxif++/8CmS4f8AOOpCA/X8="; + cargoHash = "sha256-69LK/oicfmSPbUGGzWV9kvXkHqMvEzCG8xCu61MxSdk="; patches = [ (substituteAll { @@ -56,12 +48,6 @@ in rustPlatform.buildRustPackage rec { substituteInPlace .cargo-checksum.json \ --replace $oldHash $(sha256sum build.rs | cut -d " " -f 1) popd - pushd $cargoDepsCopy/librclone - oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - patch -p1 < ${librclone-mismatched-types-patch} - substituteInPlace .cargo-checksum.json \ - --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) - popd ''; # Cargo.lock is outdated From 4738cb0cb9451b7187726b2f83146ce47b04f4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Sep 2023 15:14:29 -0700 Subject: [PATCH 09/27] celeste: install desktop file and icons --- pkgs/applications/networking/sync/celeste/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index d7a83967450f..b3b69571ade2 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -4,6 +4,7 @@ , rustPlatform , fetchFromGitHub , substituteAll +, just , pkg-config , wrapGAppsHook4 , cairo @@ -48,6 +49,11 @@ rustPlatform.buildRustPackage rec { substituteInPlace .cargo-checksum.json \ --replace $oldHash $(sha256sum build.rs | cut -d " " -f 1) popd + + substituteInPlace justfile \ + --replace "{{ env_var('DESTDIR') }}/usr" "${placeholder "out"}" + # buildRustPackage takes care of installing the binary + sed -i "#/bin/celeste#d" justfile ''; # Cargo.lock is outdated @@ -66,6 +72,7 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ + just pkg-config rustPlatform.bindgenHook wrapGAppsHook4 @@ -90,6 +97,10 @@ rustPlatform.buildRustPackage rec { ) ''; + postInstall = '' + just install + ''; + meta = { changelog = "https://github.com/hwittenborn/celeste/blob/${src.rev}/CHANGELOG.md"; description = "GUI file synchronization client that can sync with any cloud provider"; From 138113ed2dcefce691a00d7c493de87f50806863 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 13 Sep 2023 09:14:24 -0400 Subject: [PATCH 10/27] sing-box: 1.4.2 -> 1.4.3 Diff: https://github.com/SagerNet/sing-box/compare/v1.4.2...v1.4.3 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 9fc7bc951adf..abc5be83d0ef 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-OBLgAuZIqR+81rN886gIai8+uUxHDbOWnGz6jYZnGm8="; + hash = "sha256-ptnppqh7f6Cn5pMrqtqM39zFh2nEpOSrZtTxhSzFXS0="; }; - vendorHash = "sha256-oDUjiMAG/vkSYS1c8lwqVlFzyvTIQrUSeJohHS9X9I0="; + vendorHash = "sha256-XHZoXnQJMfnaPbHHoC1toxqjq/jifAI2UqZ4cc6y034="; tags = [ "with_quic" From 23e1d1e4dae96ebe63ea64753e6bea95c4554ba5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 17 Sep 2023 12:42:08 +0200 Subject: [PATCH 11/27] spglib: 2.0.2 -> 2.1.0 --- pkgs/development/libraries/spglib/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 4b634a0f1f69..7cb99f065055 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, cmake, openmp }: +{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }: stdenv.mkDerivation rec { pname = "spglib"; - version = "2.0.2"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.1.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - sha256 = "sha256-8Voepj35CMbboL3Dc55Gc4+OLPTTSgqVQuvNcRQsqmU="; + hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gtest ]; buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + doCheck = true; + meta = with lib; { description = "C library for finding and handling crystal symmetries"; homepage = "https://spglib.github.io/spglib/"; From 66867a88354d9db75a72e0d1460b1437f12ed5df Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sun, 17 Sep 2023 13:58:55 +1000 Subject: [PATCH 12/27] solc: 0.8.19 -> 0.8.21 --- pkgs/development/compilers/solc/default.nix | 10 +++------- pkgs/development/compilers/solc/tests.patch | 14 -------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/compilers/solc/tests.patch diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index cd75f3d6c394..986f6f169e8b 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -45,7 +45,7 @@ let }; pname = "solc"; - version = "0.8.19"; + version = "0.8.21"; meta = with lib; { description = "Compiler for Ethereum smart contract language Solidity"; homepage = "https://github.com/ethereum/solidity"; @@ -59,13 +59,9 @@ let # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "sha256-xh/QPYNEWxPtDaVmBeIE/Ch98g0ox9gJ/lR6ziOu+bg="; + sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk="; }; - patches = [ - ./tests.patch - ]; - postPatch = '' substituteInPlace cmake/jsoncpp.cmake \ --replace "${jsoncppUrl}" ${jsoncpp} @@ -120,7 +116,7 @@ let src = pkgs.fetchurl { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos"; - sha256 = "sha256-OMhSOrZ+Cz4hxIGJ1r+5mtaHm5zgLg2ALsi+WYuyYi0="; + sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/solc/tests.patch b/pkgs/development/compilers/solc/tests.patch deleted file mode 100644 index 45e3c7581474..000000000000 --- a/pkgs/development/compilers/solc/tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/lsp.py b/test/lsp.py -index 669951ca4..11007ae82 100755 ---- a/test/lsp.py -+++ b/test/lsp.py -@@ -28,7 +28,8 @@ else: - import tty - # Turn off user input buffering so we get the input immediately, - # not only after a line break -- tty.setcbreak(sys.stdin.fileno()) -+ if os.isatty(sys.stdin.fileno()): -+ tty.setcbreak(sys.stdin.fileno()) - - - # Type for the pure test name without .sol suffix or sub directory From 1ab0c3013048ad2cd8d3e57c1f473f44bff94f5c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 18 Sep 2023 18:43:39 -0300 Subject: [PATCH 13/27] zpaqfranz: init at 58.9 --- pkgs/by-name/zp/zpaqfranz/package.nix | 46 +++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/zp/zpaqfranz/package.nix diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix new file mode 100644 index 000000000000..6bbfdce48f39 --- /dev/null +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zpaqfranz"; + version = "58.9"; + + src = fetchFromGitHub { + owner = "fcorbelli"; + repo = "zpaqfranz"; + rev = finalAttrs.version; + hash = "sha256-R7LA7gu2q2Kk+FPCLZedwrlICk6OUao/EJHEvxA1+Nc="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildPhase = '' + runHook preBuild + + eval $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -Dunix zpaqfranz.cpp -o zpaqfranz -pthread + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 zpaqfranz -t $out/bin/ + installManPage man/zpaqfranz.1 + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/fcorbelli/zpaqfranz"; + description = "Advanced multiversioned deduplicating archiver, with HW acceleration, encryption and paranoid-level tests"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) From 65033fea280074d45e7aca7d8e5c26d361a10f59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Sep 2023 00:55:31 +0000 Subject: [PATCH 14/27] mosdepth: 0.3.4 -> 0.3.5 --- pkgs/applications/science/biology/mosdepth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index b36104bcf769..f2825eeb97be 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "mosdepth"; - version = "0.3.4"; + version = "0.3.5"; nimBinOnly = true; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "sha256-7uteYTCbAaXedPqk0WtHpqTfUWH/+rRW8aSlFixkEko="; + sha256 = "sha256-tG3J51PS6A0WBCZ+j/Nf7aaukFV+DZJsxpbTbvwu0zc="; }; buildInputs = [ docopt hts pcre ]; From 0b5a25c9afda77a66b2fbe52ae15bc2abde83711 Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 18 Sep 2023 17:26:04 +0700 Subject: [PATCH 15/27] =?UTF-8?q?lightningcss:=201.21.8=20=E2=86=92=201.22?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/lightningcss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 94afda34ba44..f5a05c07552d 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.21.8"; + version = "1.22.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "Y1eSi8/YX0iI43Zp6dCBYCZAzRnVO5nSXBykWrp9MjM="; + sha256 = "K7whGWIukMrCqGaunHVuvr9k1EOTPSMb0x/A2JysVI0="; }; - cargoHash = "sha256-OUfC0HPNsY0lBv2nM56uzFqfV3SZfOAR//VXDu6BJ+M="; + cargoHash = "sha256-itwU6JIxDbem93KIpjWyKBiZhQP62D9h8ohIcMD14+0="; buildFeatures = [ "cli" From b271eb8aabdfd45d23a5fdac3fa747c95916b1d7 Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 18 Sep 2023 17:41:45 +0700 Subject: [PATCH 16/27] lightningcss: add mainProgram --- pkgs/development/tools/lightningcss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index f5a05c07552d..47a4b1e94b8d 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -36,6 +36,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/parcel-bundler/lightningcss/releases/tag/v${version}"; license = licenses.mpl20; maintainers = with maintainers; [ toastal ]; + mainProgram = "lightningcss"; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; }; From 7d112f7da3312cb07116b5f9bac647f0f943a596 Mon Sep 17 00:00:00 2001 From: Erno Hopearuoho Date: Tue, 25 Apr 2023 16:48:54 +0300 Subject: [PATCH 17/27] luksroot: fix issue when yubikey is detached during boot process Fixes #228141, which describes an issue where detaching Yubikey during the boot process causes cryptsetup to write empty passphrase instead of the challenge-response salt stored on the boot drive. --- nixos/modules/system/boot/luksroot.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index dc3fe163116e..06c329e006b8 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -351,6 +351,12 @@ let new_response="$(ykchalresp -${toString dev.yubikey.slot} -x $new_challenge 2>/dev/null)" + if [ -z "$new_response" ]; then + echo "Warning: Unable to generate new challenge response, current challenge persists!" + umount /crypt-storage + return + fi + if [ ! -z "$k_user" ]; then new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)" else From c14d62f2729e8a1cef3f542aded5f4881578abaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Sep 2023 06:34:39 +0000 Subject: [PATCH 18/27] sudo-font: 0.69 -> 0.74 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 26870d8003b9..961f846a6c33 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.69"; + version = "0.74"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-GXlQh9JRAzbwWKTJw/y003ywjaWtiQayHxiWPTPvIO0="; + hash = "sha256-WPoqWhCKk2gZ/cdIjvmiNZ95xZ9sqnGzZuw4OEHxtrI="; }; installPhase = '' From 4d9a02acc8827d32219e044d43be9ec2f5a8e9c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Sep 2023 09:40:17 +0000 Subject: [PATCH 19/27] spicedb: 1.23.0 -> 1.25.0 --- pkgs/servers/spicedb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index a09fc3611f96..e776805d8e5d 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.23.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-PCXF5sKQmsQiHwtqerOqlKgbgaHa8R/a+oEZIiqbJXc="; + hash = "sha256-+/0raANdWXPnme/l82wzbhf+kYggBvs4iYswDUPFjlI="; }; - vendorHash = "sha256-1Z9gg2ze/TKsv4yB4+XpZeI0Dmhlg7p13DPZBb4EejU="; + vendorHash = "sha256-r0crxfE3XtsT4+5lWNY6R/bcuxq2WeongK9l7ABXQo8="; subPackages = [ "cmd/spicedb" ]; From 1e581837434fe188c1baec98f0d3c40ae1cc9094 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 18 Sep 2023 19:24:14 -0300 Subject: [PATCH 20/27] less: migrate to by-name --- .../misc/less/default.nix => by-name/le/less/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/less/default.nix => by-name/le/less/package.nix} (100%) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/by-name/le/less/package.nix similarity index 100% rename from pkgs/tools/misc/less/default.nix rename to pkgs/by-name/le/less/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 833711d1e5e0..a8713a6ab7b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9875,8 +9875,6 @@ with pkgs; leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; - less = callPackage ../tools/misc/less { }; - lha = callPackage ../tools/archivers/lha { }; lhasa = callPackage ../tools/compression/lhasa { }; From 78cccac71c66d3a8115a8ce61ca016d7dc4ecabf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 18 Sep 2023 19:28:16 -0300 Subject: [PATCH 21/27] less: 633 -> 643 - finalAttrs - split output - meta.mainProgram and meta.changelog Co-authored-by: Jack Maloney --- pkgs/by-name/le/less/package.nix | 36 ++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 76b057235360..1efce2bddefc 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -5,33 +5,37 @@ , pcre2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "less"; - version = "633"; + version = "643"; # Only tarballs on the website are valid releases, # other versions, e.g. git tags are considered snapshots. src = fetchurl { - url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; - hash = "sha256-LyAdZLgouIrzbf5s/bo+CBns4uRG6+YiSBMgmq7+0E8="; + url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz"; + hash = "sha256-KRG1QyyDb6CEyKLmj2zWMSNywCalj6qpiGJzHItgUug="; }; - configureFlags = [ - # Look for ‘sysless’ in /etc. - "--sysconfdir=/etc" - "--with-regex=pcre2" - ]; - buildInputs = [ ncurses pcre2 ]; - meta = with lib; { + outputs = [ "out" "man" ]; + + configureFlags = [ + # Look for 'sysless' in /etc. + "--sysconfdir=/etc" + "--with-regex=pcre2" + ]; + + meta = { homepage = "https://www.greenwoodsoftware.com/less/"; - description = "A more advanced file pager than ‘more’"; - platforms = platforms.unix; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ eelco dtzWill ]; + description = "A more advanced file pager than 'more'"; + changelog = "https://www.greenwoodsoftware.com/less/news.${finalAttrs.version}.html"; + license = lib.licenses.gpl3Plus; + mainProgram = "less"; + maintainers = with lib.maintainers; [ eelco dtzWill ]; + platforms = lib.platforms.unix; }; -} +}) From fd09de7be5279da58b5f6b417cc9f40def8d4b7d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 10 Sep 2023 14:45:28 -0300 Subject: [PATCH 22/27] mksh: migrate to by-name --- .../mk/mksh/package.nix} | 25 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 13 insertions(+), 14 deletions(-) rename pkgs/{shells/mksh/default.nix => by-name/mk/mksh/package.nix} (74%) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/by-name/mk/mksh/package.nix similarity index 74% rename from pkgs/shells/mksh/default.nix rename to pkgs/by-name/mk/mksh/package.nix index 3e4791e2b8a3..27cee1d4e226 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/by-name/mk/mksh/package.nix @@ -4,19 +4,20 @@ , installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mksh"; version = "59c"; src = fetchurl { urls = [ - "http://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" - "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" + "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${finalAttrs.version}.tgz" + "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${finalAttrs.version}.tgz" ]; hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; }; strictDeps = true; + nativeBuildInputs = [ installShellFiles ]; @@ -37,7 +38,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru = { + shellPath = "/bin/mksh"; + }; + + meta = { homepage = "http://www.mirbsd.org/mksh.htm"; description = "MirBSD Korn Shell"; longDescription = '' @@ -47,14 +52,10 @@ stdenv.mkDerivation rec { also to be readily available under other UNIX(R)-like operating systems. ''; - license = with licenses; [ miros isc unicode-dfs-2016 ]; - maintainers = with maintainers; [ AndersonTorres joachifm ]; - platforms = platforms.unix; + license = with lib.licenses; [ miros isc unicode-dfs-2016 ]; + maintainers = with lib.maintainers; [ AndersonTorres joachifm ]; + platforms = lib.platforms.unix; }; - - passthru = { - shellPath = "/bin/mksh"; - }; -} +}) # TODO [ AndersonTorres ]: lksh # TODO [ AndersonTorres ]: a more accurate licensing info diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8713a6ab7b5..e98ae13ad335 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15394,8 +15394,6 @@ with pkgs; liquidprompt = callPackage ../shells/liquidprompt { }; - mksh = callPackage ../shells/mksh { }; - murex = callPackage ../shells/murex { }; oh = callPackage ../shells/oh { }; From 88a627e01273c4301e3ab533a5e85fea51d5ecd9 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 9 Sep 2023 18:05:59 -0300 Subject: [PATCH 23/27] rc: migrate to by-name --- pkgs/{shells/rc/default.nix => by-name/rc/rc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{shells/rc/default.nix => by-name/rc/rc/package.nix} (100%) diff --git a/pkgs/shells/rc/default.nix b/pkgs/by-name/rc/rc/package.nix similarity index 100% rename from pkgs/shells/rc/default.nix rename to pkgs/by-name/rc/rc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e98ae13ad335..e86cbda96213 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12555,8 +12555,6 @@ with pkgs; ratt = callPackage ../applications/misc/ratt { }; - rc = callPackage ../shells/rc { }; - rc-9front = callPackage ../shells/rc-9front { }; rcon = callPackage ../tools/networking/rcon { }; From c3f4c7f54ce38f1bf69d2a557c4c37c036436073 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 18 Sep 2023 14:24:35 -0300 Subject: [PATCH 24/27] elvish: refactor - move installCheck to passthru.tests - migrate to by-name --- .../el/elvish/package.nix} | 27 +++++-------------- .../el/elvish/tests/expect-version.elv | 8 ++++++ .../el/elvish/tests/expect-version.nix | 25 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 39 insertions(+), 23 deletions(-) rename pkgs/{shells/elvish/default.nix => by-name/el/elvish/package.nix} (63%) create mode 100644 pkgs/by-name/el/elvish/tests/expect-version.elv create mode 100644 pkgs/by-name/el/elvish/tests/expect-version.nix diff --git a/pkgs/shells/elvish/default.nix b/pkgs/by-name/el/elvish/package.nix similarity index 63% rename from pkgs/shells/elvish/default.nix rename to pkgs/by-name/el/elvish/package.nix index 1bd0c138c9c0..0069dad4f0c6 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/by-name/el/elvish/package.nix @@ -1,13 +1,12 @@ { lib , buildGoModule , fetchFromGitHub -, runCommand +, callPackage }: let pname = "elvish"; version = "0.19.2"; - shellPath = "/bin/elvish"; in buildGoModule { inherit pname version; @@ -32,26 +31,12 @@ buildGoModule { strictDeps = true; doCheck = false; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out${shellPath} -c " - fn expect {|key expected| - var actual = \$buildinfo[\$key] - if (not-eq \$actual \$expected) { - fail '\$buildinfo['\$key']: expected '(to-string \$expected)', got '(to-string \$actual) - } - } - - expect version ${version} - " - - runHook postInstallCheck - ''; passthru = { - inherit shellPath; + shellPath = "/bin/elvish"; + tests = { + expectVersion = callPackage ./tests/expect-version.nix { }; + }; }; meta = { @@ -63,6 +48,6 @@ buildGoModule { status, it is already suitable for most daily interactive use. ''; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ vrthra AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/by-name/el/elvish/tests/expect-version.elv b/pkgs/by-name/el/elvish/tests/expect-version.elv new file mode 100644 index 000000000000..72f8c081f61b --- /dev/null +++ b/pkgs/by-name/el/elvish/tests/expect-version.elv @@ -0,0 +1,8 @@ +fn expect {|key expected| + var actual = $buildinfo[$key] + if (not-eq $actual $expected) { + fail '$buildinfo['$key']: expected '(to-string $expected)', got '(to-string $actual) + } +} + +expect version @version@ diff --git a/pkgs/by-name/el/elvish/tests/expect-version.nix b/pkgs/by-name/el/elvish/tests/expect-version.nix new file mode 100644 index 000000000000..406f2131199d --- /dev/null +++ b/pkgs/by-name/el/elvish/tests/expect-version.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, elvish +, substituteAll +}: + +stdenv.mkDerivation { + pname = "elvish-simple-test"; + inherit (elvish) version; + + nativeBuildInputs = [ elvish ]; + + dontInstall = true; + + buildCommand = '' + elvish ${substituteAll { + src = ./expect-version.elv; + inherit (elvish) version; + }} + + touch $out + ''; + + meta.timeout = 10; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e86cbda96213..a2a8b29b5b7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3749,8 +3749,6 @@ with pkgs; sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { }; - emplace = callPackage ../tools/package-management/emplace { }; enchive = callPackage ../tools/security/enchive { }; From f58d86bf7ee06eacec444b805ba0731df382428b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 19 Sep 2023 12:18:24 +0800 Subject: [PATCH 25/27] archiver: use sri hash --- pkgs/applications/misc/archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 7fb0de24c114..2389285e99c0 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp"; + hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8="; }; - vendorSha256 = "1y4v95z1ga111g3kdv5wvyikwifl25f36firf1i916rxli6f6g5i"; + vendorHash = "sha256-sTzjTKQ9m5BicDk6M1wR1EU+o9+87DbHCyGoF35Jm/g="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; From 3dd248db21547e8f1daa8cf4807e20d40b1f4358 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 Sep 2023 04:21:09 +0200 Subject: [PATCH 26/27] =?UTF-8?q?ocamlPackages.ocamlgraph:=202.0.0=20?= =?UTF-8?q?=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocamlgraph/default.nix | 10 ++++------ pkgs/development/ocaml-modules/ocamlgraph/gtk.nix | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 39fbf2d8a534..c075fc59be1c 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -2,23 +2,21 @@ buildDunePackage rec { pname = "ocamlgraph"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/backtracking/ocamlgraph/releases/download/${version}/ocamlgraph-${version}.tbz"; - sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0"; + hash = "sha256-D5YsNvklPfI5OVWvQbB0tqQmsvkqne95WyAFtX0wLWU="; }; - minimalOCamlVersion = "4.03"; - useDune2 = true; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ stdlib-shims ]; meta = with lib; { - homepage = "http://ocamlgraph.lri.fr/"; - downloadPage = "https://github.com/backtracking/ocamlgraph"; + homepage = "https://github.com/backtracking/ocamlgraph"; description = "Graph library for OCaml"; license = licenses.gpl2Oss; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix b/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix index 1aa438ffa448..e8167356f939 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ocamlgraph_gtk"; - inherit (ocamlgraph) version src useDune2 meta; + inherit (ocamlgraph) version src meta; propagatedBuildInputs = [ lablgtk From 835736de35faba3e57a7a4becc6b7e472ae72317 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Tue, 19 Sep 2023 00:58:11 -0500 Subject: [PATCH 27/27] coder: fix broken pkg (#255964) * coder: fix broken pkg, bump version * coder: revert version --- pkgs/development/tools/coder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 48e47dd06631..e00fd43b3a24 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -49,8 +49,10 @@ buildGoModule rec { fixup_yarn_lock yarn.lock # node-gyp tries to download always the headers and fails: https://github.com/NixOS/nixpkgs/issues/195404 - yarn remove --offline jest-canvas-mock canvas + # playwright tries to download Chrome and fails + yarn remove --offline jest-canvas-mock canvas @playwright/test playwright + export PATH=$PATH:$(pwd)/node_modules/.bin NODE_ENV=production node node_modules/.bin/vite build popd @@ -84,7 +86,5 @@ buildGoModule rec { homepage = "https://coder.com"; license = lib.licenses.agpl3; maintainers = [ lib.maintainers.ghuntley lib.maintainers.urandom ]; - # Failed to download Chromium 109.0.5414.46 - broken = true; # At 2023-03-30 }; }