diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 879f077332e3..8f9c66b01572 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1296,14 +1296,14 @@ in ''; # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface. - newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" '' + newInterfaceScript = new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" '' #!${pkgs.runtimeShell} # Configure the new interface ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type} - ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${device} set meshid ${new.meshID}"} - ${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${device} set monitor ${new.flags}"} - ${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${device} set 4addr ${if new.fourAddr then "on" else "off"}"} - ${optionalString (new.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${device} address ${new.mac}"} + ${optionalString (new.type == "mesh" && new.meshID!=null) "${pkgs.iw}/bin/iw dev ${new._iName} set meshid ${new.meshID}"} + ${optionalString (new.type == "monitor" && new.flags!=null) "${pkgs.iw}/bin/iw dev ${new._iName} set monitor ${new.flags}"} + ${optionalString (new.type == "managed" && new.fourAddr!=null) "${pkgs.iw}/bin/iw dev ${new._iName} set 4addr ${if new.fourAddr then "on" else "off"}"} + ${optionalString (new.mac != null) "${pkgs.iproute2}/bin/ip link set dev ${new._iName} address ${new.mac}"} ''; # Udev attributes for systemd to name the device and to create a .device target. @@ -1318,7 +1318,7 @@ in # It is important to have that rule first as overwriting the NAME attribute also prevents the # next rules from matching. ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces.${device}) (interface: - ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')} + ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript interface}"'')} # Add the required, new WLAN interfaces to the default WLAN interface with the # persistent, default name as assigned by udev. diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index c8756207f27b..22f7ca5a9b82 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -721,6 +721,24 @@ let assert "mtu 1442" in client.succeed("ip l show dummy0") ''; }; + wlanInterface = let + testMac = "06:00:00:00:02:00"; + in { + name = "WlanInterface"; + machine = { pkgs, ... }: { + boot.kernelModules = [ "mac80211_hwsim" ]; + networking.wlanInterfaces = { + wlan0 = { device = "wlan0"; }; + wap0 = { device = "wlan0"; mac = testMac; }; + }; + }; + testScript = '' + machine.start() + machine.wait_for_unit("network.target") + machine.wait_until_succeeds("ip address show wap0 | grep -q ${testMac}") + machine.fail("ip address show wlan0 | grep -q ${testMac}") + ''; + }; }; in mapAttrs (const (attrs: makeTest (attrs // { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5d8d4afeece8..93511c8febae 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "94.0.4606.20", - "sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg", - "sha256bin64": "0ahc09qv78vmx72kqhjj2lwcniqn9q73vkc1b9lyv184ai3269sq", + "version": "94.0.4606.31", + "sha256": "1f5hk2acd9lj88m2acz8ik85fh5h3giz65p19dpfg92zsyly54nf", + "sha256bin64": "1ypf9j51a4kmx27x3s9izzbd2r094idz194gwhbdly75l1x8hk4z", "deps": { "gn": { "version": "2021-08-11", diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 850a5f3d772e..e8a1bfeb1909 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,17 +2,11 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.5.1"; - - reflectionJson = fetchurl { - name = "reflection.json"; - url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1mx89rrkxyn7s8nfif0564gjrpc299wzl0wfq9qx8blc6a1438a9"; - }; + version = "0.6.0"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "0rp6lam3psnk12j69z8qp1ixyp7zvvjahn18mvkmc38naml0p514"; + sha256 = "sha256-W7zcTs0nTw1ed04ev7WKAMyBd/2n4Mezo5kh0sHFyyc="; }; dontUnpack = true; @@ -27,43 +21,18 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - # https://github.com/babashka/babashka/blob/77daea7362d8e2562c89c315b1fbcefde6fa56a5/script/compile + # https://github.com/babashka/babashka/blob/v0.6.0/script/compile#L41-L52 args=("-jar" "$BABASHKA_JAR" "-H:Name=$BABASHKA_BINARY" - "${lib.optionalString stdenv.isDarwin ''-H:-CheckToolchain''}" "-H:+ReportExceptionStackTraces" - "-J-Dclojure.spec.skip-macros=true" - "-J-Dclojure.compiler.direct-linking=true" - "-H:IncludeResources=BABASHKA_VERSION" - "-H:IncludeResources=META-INF/babashka/.*" - "-H:IncludeResources=SCI_VERSION" - "-H:ReflectionConfigurationFiles=${reflectionJson}" - "--initialize-at-build-time" # "-H:+PrintAnalysisCallTree" # "-H:+DashboardAll" # "-H:DashboardDump=reports/dump" # "-H:+DashboardPretty" # "-H:+DashboardJson" - "-H:Log=registerResource:" - "-H:EnableURLProtocols=http,https,jar" - "--enable-all-security-services" - "-H:+JNI" "--verbose" "--no-fallback" - "--no-server" - "--report-unsupported-elements-at-runtime" - "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" - "--initialize-at-run-time=org.httpkit.client.ClientSslEngineFactory\$SSLHolder" "--native-image-info" - "--verbose" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileReader" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileReader" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.MixerProvider" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.FormatConversionProvider" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileWriter" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiDeviceProvider" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.SoundbankReader" - "-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileWriter" "$BABASHKA_XMX") native-image ''${args[@]} @@ -113,6 +82,7 @@ stdenv.mkDerivation rec { - Library support via popular tools like the clojure CLI ''; homepage = "https://github.com/babashka/babashka"; + changelog = "https://github.com/babashka/babashka/blob/v${version}/CHANGELOG.md"; license = licenses.epl10; platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/development/libraries/arpa2common/default.nix new file mode 100644 index 000000000000..7fcb2a945e8f --- /dev/null +++ b/pkgs/development/libraries/arpa2common/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake + +, arpa2cm +, doxygen +, e2fsprogs +, lmdb +, openssl +, pkg-config +, ragel +}: + +stdenv.mkDerivation rec { + pname = "arpa2common"; + version = "2.2.14"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LWsWoHRdLWRSF9JaEwrw+CXm5Azgh7zNeq0a8Z/hijQ="; + }; + + nativeBuildInputs = [ + cmake + arpa2cm + doxygen + pkg-config + ]; + + propagatedBuildInputs = [ + e2fsprogs + lmdb + openssl + ragel + ]; + + # the project uses single argument `printf` throughout the program + hardeningDisable = [ "format" ]; + + meta = { + description = + "ARPA2 ID and ACL libraries and other core data structures for ARPA2"; + longDescription = '' + The ARPA2 Common Library package offers elementary services that can + benefit many software packages. They are designed to be easy to + include, with a minimum of dependencies. At the same time, they were + designed with the InternetWide Architecture in mind, thus helping to + liberate users. + ''; + homepage = "https://gitlab.com/arpa2/arpa2common"; + license = with lib.licenses; [ bsd2 cc-by-sa-40 cc0 isc ]; + maintainers = with lib.maintainers; [ fufexan ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index c9412428a9c4..e7e057b5a8c3 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9572"; + version = "9.0.9684"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cjVKIlvGu1SCiVkegJ36GevZ9bihYF7n3P/xNqtAapw="; + sha256 = "sha256-dWHioxNpNuvUTC8FkkKTsoRs4x+eHUfDb4rpgeIGaIA="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 20c658909bec..ed7bb44349d2 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9572"; + version = "9.0.9684"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZA2PKyJVXrSs2IvpjMyHGrtAPUpUZFhUzlKURLEWm5o="; + sha256 = "sha256-37WCiH0uYRRh8yxNwz9OW0LcyNS9Kr2l1J662JYaPhg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index f0e0f4e1658b..9605539a9cb6 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9572"; + version = "9.0.9684"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R4i7hQGwc74/szehcWBjkC6b9DsblluHKWxEk0iSFRI="; + sha256 = "sha256-rl7ZELiLAVuCOkR6NVCUB5c6AtW/rFniDxB3E9ZPnK8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 5c8f04f4b948..66f9444f0edf 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9572"; + version = "9.0.9684"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OzgLGjEVOVRnQvWVcci8EGn6gtO8D8QoDnC9dfXGHZU="; + sha256 = "sha256-uRwNvYrea3oexJ3Rcoa9oUMXa+gSnha2K0NM8e/A09k="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 26aa06466600..30400fcdaf56 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9572"; + version = "9.0.9684"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YC605gIM+l9Tnx6lu0ayrnYPE6Xx+aTgDXPziFY/lDA="; + sha256 = "sha256-tGRnCsuOLqZmWBcITF0TzgQ7kW6e7wZyhtObyU5Pasw="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e2f0a7feed07..be8106f97f43 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9572"; + version = "9.0.9684"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b1LMHeaQqz0fNleRlME0kgSYZGGXBhFKCp0iRr/2A7c="; + sha256 = "sha256-yza6Q0kxDXHOXxZcDFt43I621dSGI+bzTUrxWAQkGFQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 478782b488c8..a6af74b3e4e9 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "5.1.4"; + version = "5.2.0"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "sha256-aDmmF3T5v6NX3kut7cydEJNRw4mkrGt4X0+WOm/ZCVo="; + sha256 = "1jd3rr8dydfaxz5g8idpwacp4bnbmhg74dwz7qwmzn34336s4ji6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 2b8bdb171560..c07199b741e8 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9572"; + version = "9.0.9684"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ish37nO+r1VJY9XS83K8tu60Snhd547n965TFqdBgzs="; + sha256 = "sha256-pf+LUFatC16a8EScoNYZKCXiaCINPRRn+6R1Op4GMRE="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 09f35a4c64f8..d39b4fa82c81 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.1.1"; + version = "3.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HViDxJbaOoqnHR9NpIYs43TcfM9F5Ltn3rIBbsNPjTM="; + sha256 = "sha256-0gNMNVhlH32P2t6oP7aBBQstZi3GegDZUDJtyQIClEQ="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 4f4dddbc9453..2eee78c1c19c 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "yodl"; - version = "4.03.02"; + version = "4.03.03"; nativeBuildInputs = [ icmake ]; buildInputs = [ perl ]; src = fetchFromGitLab { - sha256 = "sha256-ZxiF9He0JgqhbnQS2pE7Y85sED8avbdwGuVmFN8/XgE="; + sha256 = "sha256-MeD/jjhwoiWTb/G8pHrnEEX22h+entPr9MhJ6WHO3DM="; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 5cec6589c11d..9b7f78fa3b51 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "04vp2w07da9b4cfrdp8jj5fp5v7xzdx2946v7195n2krhrdhq957"; + sha256 = "sha256-zQwgnZFYXYG1NWzC9ZultTUlU+o/Sr2u3CnRXzr+Lk8="; }; - cargoSha256 = "0ch22aysbpp38xny3sfbzrbsflfva57dlslkdqsmf4a7bckpbkhs"; + cargoSha256 = "sha256-ORv5O7DhZhmmOM5RnRIIe/WBU77iyROPIRGMJikUCgo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 04a0df6c7db6..cae010c5a19f 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "1wg9kqwc2h2689xqb2m9fgxc4rhi3pnml08q3hg4fq6l31damaj5"; + sha256 = "sha256-6mZ8XstophadNk/3zJe2n3WL4u34jjnWh9m2qrt06hw="; }; - vendorSha256 = "0pcxadyhppaf7iarl2y6f2crjzg85x4hrg1m1pg3mydqm4gvg5vx"; + vendorSha256 = "sha256-tJ9cdZloTSXoytmMJ+6S5XAKHYs16SZmbUwZdmVnDzc="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb9a7b07e07e..f4d88610603d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13238,6 +13238,8 @@ with pkgs; arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { }; + arpa2common = callPackage ../development/libraries/arpa2common { }; + asn2quickder = python2Packages.callPackage ../development/tools/asn2quickder {}; astyle = callPackage ../development/tools/misc/astyle { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dfcbd7042c5c..3bee76dc00c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19799,6 +19799,22 @@ let }; }; + SyntaxKeywordTry = buildPerlModule { + pname = "Syntax-Keyword-Try"; + version = "0.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.25.tar.gz"; + sha256 = "0xd82gcpcrnmwxsbk7x0ainmyybdc087g6j69hrpy80j0asnq2f5"; + }; + propagatedBuildInputs = [ XSParseKeyword ]; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "A try/catch/finally syntax for perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + SysMmap = buildPerlPackage { pname = "Sys-Mmap"; version = "0.20";