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 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. ''; }; 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; }; } 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" ]; diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 0e0b36263831..b3b69571ade2 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -4,7 +4,7 @@ , rustPlatform , fetchFromGitHub , substituteAll -, fetchpatch +, just , pkg-config , wrapGAppsHook4 , cairo @@ -20,25 +20,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 +49,11 @@ 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 + + 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 @@ -80,6 +72,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ + just pkg-config rustPlatform.bindgenHook wrapGAppsHook4 @@ -104,6 +97,10 @@ in 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"; 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 ]; 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/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix new file mode 100644 index 000000000000..1efce2bddefc --- /dev/null +++ b/pkgs/by-name/le/less/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, pcre2 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "less"; + 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-${finalAttrs.version}.tar.gz"; + hash = "sha256-KRG1QyyDb6CEyKLmj2zWMSNywCalj6qpiGJzHItgUug="; + }; + + buildInputs = [ + ncurses + pcre2 + ]; + + 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'"; + 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; + }; +}) 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/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/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; + }; +}) 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 = '' 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 ]; }; } 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 ]; }; } 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 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 = [ 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/"; 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 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/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 }; } diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 94afda34ba44..47a4b1e94b8d 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" @@ -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; }; 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" ]; 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: { diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix deleted file mode 100644 index 76b057235360..000000000000 --- a/pkgs/tools/misc/less/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses -, pcre2 -}: - -stdenv.mkDerivation rec { - pname = "less"; - version = "633"; - - # 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="; - }; - - configureFlags = [ - # Look for ‘sysless’ in /etc. - "--sysconfdir=/etc" - "--with-regex=pcre2" - ]; - - buildInputs = [ - ncurses - pcre2 - ]; - - meta = with lib; { - 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 ]; - }; -} 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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70093d7783e5..1636309a6d43 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 { }; @@ -9875,8 +9873,6 @@ with pkgs; leocad = libsForQt5.callPackage ../applications/graphics/leocad { }; - less = callPackage ../tools/misc/less { }; - lha = callPackage ../tools/archivers/lha { }; lhasa = callPackage ../tools/compression/lhasa { }; @@ -12557,8 +12553,6 @@ with pkgs; ratt = callPackage ../applications/misc/ratt { }; - rc = callPackage ../shells/rc { }; - rc-9front = callPackage ../shells/rc-9front { }; rcon = callPackage ../tools/networking/rcon { }; @@ -15396,8 +15390,6 @@ with pkgs; liquidprompt = callPackage ../shells/liquidprompt { }; - mksh = callPackage ../shells/mksh { }; - murex = callPackage ../shells/murex { }; oh = callPackage ../shells/oh { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd10caec3cd3..52f58a04875c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6053,6 +6053,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 { }; @@ -7943,7 +7947,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 { }; @@ -9055,7 +9061,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 { }; @@ -9714,7 +9722,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 { }; @@ -11585,7 +11595,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 { };