diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 11b49f4f235a..29cb2e0e464a 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -92,7 +92,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti - []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`. -- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper. +- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper. - []{#ssec-gnome-hooks-gtk-drop-icon-theme-cache} One of `gtk3`’s setup hooks will remove `icon-theme.cache` files from package’s icon theme directories to avoid conflicts. Icon theme packages should prevent this with `dontDropIconThemeCache = true;`. diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 41fe0de04b4d..17b80f07d3e1 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -128,7 +128,7 @@ Let's present the luarocks way first and the manual one in a second time. ### Packaging a library on luarocks {#packaging-a-library-on-luarocks} -[Luarocks.org](www.luarocks.org) is the main repository of lua packages. +[Luarocks.org](https://luarocks.org/) is the main repository of lua packages. The site proposes two types of packages, the rockspec and the src.rock (equivalent of a [rockspec](https://github.com/luarocks/luarocks/wiki/Rockspec-format) but with the source). These packages can have different build types such as `cmake`, `builtin` etc . diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index cb5311fc95f1..4ffd6736e238 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -309,9 +309,9 @@ Sample output2: ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. -Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: +Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: ```nix deoplete-fish = super.deoplete-fish.overrideAttrs(old: { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e6b9a1680722..ec4f9b59e919 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,16 +9,16 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.25"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg"; + version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs="; }; betaVersion = { - version = "2021.1.1.17"; # "Android Studio Bumblebee (2021.1.1) Beta 4" - sha256Hash = "5WLUgCmdrK0PArc4eQQTNbEokq4DReKRwsZOWKb+Td4="; + version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5" + sha256Hash = "gWG8h3wTQDH84vSKlfTm3soUqLkwFYfSymJuAAFPDuQ="; }; latestVersion = { # canary & dev - version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3" - sha256Hash = "sha256-xIVdM28NDadvJklDIw71iJ7Z5GPVJ1ZDJ+t1y+bt8cE="; + version = "2021.2.1.5"; # "Android Studio Chipmunk (2021.2.1) Canary 5" + sha256Hash = "PS45nu5g9qXNeolYnFEs//Z6p8eIZoD6kUo/0yfHQ6A="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index e42c0980a1bc..17e9972cbe9f 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -9,15 +9,15 @@ let in stdenv.mkDerivation rec { pname = "brscan5"; - version = "1.2.6-0"; + version = "1.2.7-0"; src = { "i686-linux" = fetchurl { url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb"; - sha256 = "102q745pc0168syggd4gym51qf3m3iqld3a4skfnbkm6yky4w4s8"; + sha256 = "647d06f629c22408d25be7c0bf49a4b1c7280bf78a27aa2cde6c3e3fa8b6807a"; }; "x86_64-linux" = fetchurl { url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb"; - sha256 = "1pwbzhpg5nzpw2rw936vf2cr334v8iny16y8fbb1zimgzmv427wx"; + sha256 = "867bd88ab0d90f8e9391dc8127385095127e533cb6bd2d5d13449df602b165ae"; }; }."${stdenv.hostPlatform.system}"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pushd $out/$PATH_TO_BRSCAN5 ln -s libLxBsDeviceAccs.so.1.0.0 libLxBsDeviceAccs.so.1 ln -s libLxBsNetDevAccs.so.1.0.0 libLxBsNetDevAccs.so.1 - ln -s libLxBsScanCoreApi.so.3.0.0 libLxBsScanCoreApi.so.3 + ln -s libLxBsScanCoreApi.so.3.2.0 libLxBsScanCoreApi.so.3 ln -s libLxBsUsbDevAccs.so.1.0.0 libLxBsUsbDevAccs.so.1 ln -s libsane-brother5.so.1.0.7 libsane-brother5.so.1 popd diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 35e3a8eeb63d..741a17be9ee4 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "xHjT2QbZBfPc0i+tsY/hXo+oY8djJiMnM7GraHVvUHs="; + sha256 = "PGrx2JBYmp5vQ8jLpOfiT1T1+SNeRt0W5oHUjHNKuBE="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 193f1d3e268c..c3a62b4fd2f7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "96.0.4664.93", - "sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw", - "sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb", + "version": "96.0.4664.110", + "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n", + "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb", "deps": { "gn": { "version": "2021-09-24", diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 4a92fd87f267..82d7fe3237b2 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.6.0"; + version = "1.6.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-F0yS4SpUwJAf2fC62s8VFMKLUZepVlTk2rF3UpPd4dw="; + sha256 = "sha256-QyJnmW0Na0sXyo3g+HjkTUoJm36fFYepjtxNJ+dsIVo="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index b1a50cdcf40f..514293e57459 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.6.0"; + version = "1.6.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-HLI6E3Y8l/5vAgjT39ezBCEYhCGV3pdjx1B1fL57qO4="; - "macos-x86_64" = "sha256-cJV+dP9/pJHlJx55HMqd7KC/OIWEzPXKmobCZLBZ+ec="; - "linux-x86_64" = "sha256-C5R2hdPg1cOA9WcSZYkN22Ca3/pslEcp554tuy/HxnQ="; + "macos-aarch64" = "sha256-W+9F1YZ5ATa6KaALYQEXW4xr4UxfquuC72xoB2987iM="; + "macos-x86_64" = "sha256-pceORt+YJZiP67nbnUB6ny1ic/r0aTrdA2hsQi5Otp8="; + "linux-x86_64" = "sha256-tcZffJPcR6PYJ22wIh5BHn/yjG3Jb+MG5COLbAQ2/Ww="; }.${arch}; in fetchurl { diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 4d872f0084e4..992caf200a74 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -11,21 +11,21 @@ let name = "cbqn-bytecode-files"; owner = "dzaima"; repo = "CBQN"; - rev = "db686e89d4d2e9bfac3dddf306dff890135b2de1"; - hash = "sha256-RJ751jCsAGjqQx3V5S5Uc611n+/TBs6G2o0q26x98NM="; + rev = "b000b951aa8f3590b196b4c09056604c0b32a168"; + hash = "sha256-znW0xOXogP4TfifUmk3cs4aN/9mMSpSD2WJppmeI1Fg="; }; in assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.pre+date=2021-11-06"; + version = "0.pre+date=2021-12-13"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "cd866e1e45ce0f22bfacd25565ab912c06cb040f"; - hash = "sha256-XuowrGDgrttRL/SY5si0nqHMKEidSNrQuquxNdBCW8o="; + rev = "e7662b0f6a44add0749fba2a6d7309a5c1eb2601"; + hash = "sha256-2nfkTZBIGHX5cok6Ea3KSewakZy8Ey8nSO2Fe4xGgvg="; }; dontConfigure = true; diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix index fd0ff51c0eb1..fbb5b458d08b 100644 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "bqn"; - version = "0.pre+date=2021-11-08"; + version = "0.pre+date=2021-12-13"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "5c68173276c1c1b136a7eda3ad8f4423ab0ee9d0"; - hash = "sha256-e0P1I8I/J41Hk7Edb4uKCdx30Azkiheq014kSZzJ8yg="; + rev = "2c2e86e10ff963a6aefa14f76fd8833ce3c9157c"; + hash = "sha256-iAlDXGlHTeI6+r/QKFiBHhj5A+FgUy7JFrCpAwpyVQU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/science/math/primecount/default.nix b/pkgs/development/libraries/science/math/primecount/default.nix new file mode 100644 index 000000000000..7985b9d6dbd6 --- /dev/null +++ b/pkgs/development/libraries/science/math/primecount/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, primesieve }: + +stdenv.mkDerivation rec { + pname = "primecount"; + version = "7.2"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ primesieve ]; + + src = fetchFromGitHub { + owner = "kimwalisch"; + repo = "primecount"; + rev = "v${version}"; + sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; + }; + + meta = with lib; { + description = "Fast prime counting function implementations"; + homepage = "https://github.com/kimwalisch/primecount"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = teams.sage.members; + }; +} diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index d432fd158892..f6d1233d2791 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.16.3"; + version = "0.17.0"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "TjHxqtz8mPhzpsMb5lXWdj8hx/whsadTfor4S2x4U2M="; + sha256 = "sha256-rrZtftnvKWJ8f8qIjAOcudn2uvE1upwgByoLrtv1leY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 6f6c5d3f0cf9..cc4a029b7b55 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "agshUVkkqogj4FbonFd/rrGisMOomS62NND66YKZvjg="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "rapidfuzz >= 1.8.2, < 1.9" "rapidfuzz" + ''; + propagatedBuildInputs = [ rapidfuzz ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 7e87fbab5d39..12d46f376633 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.8.3"; + version = "1.9.0"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-DjMUI5JBomv0f2AC1Nvb3DeqWn65AvZJWhWus4AZk7w="; + sha256 = "sha256-INtoJXPe22vB6Yi9Co3xxJ8uxZYz9dn0eMF+fo9GfIo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 5680b4bd36b3..587572646abc 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -1,52 +1,107 @@ { lib , fetchFromGitHub , buildPythonPackage -, nassl -, cryptography -, typing-extensions -, faker , pytestCheckHook , pythonOlder + # deps +, cryptography +, nassl +, pydantic +, tls-parser + # check deps +, faker +, openssl_1_0_2 +, openssl_1_1 }: buildPythonPackage rec { pname = "sslyze"; - version = "4.1.0"; + version = "5.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-oSTKNiECczlPAbv5Azc023PcquFbnlC5O+8tVgNcUW0="; + hash = "sha256-7kUriEMHcGCXKs42KVWxXvM+JEEWf/8tnuoGujHbqHY="; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<3.5" "cryptography>=2.6,<4.0" + --replace "cryptography>=2.6,<36.0.0" "cryptography>=2.6" ''; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + faker + ]; # Most of the tests are online; hence, applicable tests are listed # explicitly here pytestFlagsArray = [ - "tests/test_main.py" - "tests/test_scanner.py" "tests/cli_tests/test_console_output.py" - "tests/cli_tests/test_json_output.py" "tests/cli_tests/test_server_string_parser.py" - "tests/plugins_tests/test_scan_commands.py" + "tests/json_tests/test_json_output.py" + "tests/plugins_tests/certificate_info/test_certificate_algorithms.py" "tests/plugins_tests/certificate_info/test_certificate_utils.py" + "tests/plugins_tests/certificate_info/test_symantec.py" + "tests/plugins_tests/certificate_info/test_trust_store_repository.py" + "tests/plugins_tests/openssl_cipher_suites/test_cipher_suites.py" + "tests/plugins_tests/test_early_data_plugin.py" + "tests/plugins_tests/test_http_headers_plugin.py" + "tests/plugins_tests/test_robot_plugin.py" + "tests/plugins_tests/test_scan_commands.py" + "tests/plugins_tests/test_session_renegotiation_plugin.py" + "tests/scanner_tests/test_jobs_worker_thread.py" + "tests/scanner_tests/test_mass_scanner.py" + "tests/scanner_tests/test_models.py" + "tests/scanner_tests/test_scanner.py" + "tests/server_connectivity_tests/test_client_authentication.py" ]; disabledTests = [ - "test_error_client_certificate_needed" + # TestEllipticCurvesPluginWithOnlineServer + "test_supported_curves" + # TestRobotPluginPlugin + "test_robot_attack_good" + # TestHttpHeadersPlugin + "test_all_headers_disabled" + "test_expect_ct_enabled" + "test_hsts_enabled" + # TestSessionRenegotiationPlugin + "test_renegotiation_good" + # TestCertificateAlgorithms + "test_ecdsa_certificate" + "test_invalid_certificate_bad_name" + # TestEarlyDataPlugin + "test_early_data_enabled" + # TestTrustStoresRepository + "test_update_default" + # TestClientAuthentication + "test_optional_client_authentication" ]; + # Some tests require OpenSSL + preCheck = '' + pushd $TMPDIR/$sourceRoot/tests/openssl_server/ + + rm openssl-1-1-1-linux64 + ln -s ${openssl_1_1.bin}/bin/openssl openssl-1-1-1-linux64 + + rm openssl-1-0-0e-linux64 + ln -s ${openssl_1_0_2.bin}/bin/openssl openssl-1-0-0e-linux64 + + popd + ''; + pythonImportsCheck = [ "sslyze" ]; - propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; + propagatedBuildInputs = [ + cryptography + nassl + pydantic + tls-parser + ]; meta = with lib; { homepage = "https://github.com/nabla-c0d3/sslyze"; diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix new file mode 100644 index 000000000000..a65aacd4eb2c --- /dev/null +++ b/pkgs/development/python-modules/vpk/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "vpk"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "ValvePython"; + repo = "vpk"; + rev = "v${version}"; + hash = "sha256-kFKu4fuclanMdlfA/2ZccglM7rSzaq9BbbSaKuIN+Pk="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library for working with Valve Pak files"; + homepage = "https://github.com/ValvePython/vpk"; + license = licenses.mit; + maintainers = with maintainers; [ joshuafern ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index dab8e7f60ed7..ae56f9ba0ec2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.648"; + version = "2.0.659"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-WhBbZiLPGA9Dvn8xJaPOvOjEeVOWHBVLyEav4Mw/Xy8="; + sha256 = "sha256-oxR4hji7BWnbAihZXLdOlCZlzpvZcs6RNoyGwQe+PlQ="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 4a05d89ac80a..d0ff53fb96b9 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, augeas, dnsutils, c-ares, curl, cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, - python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, + python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, pcre2, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, - libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, p11-kit, + libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit, nss_wrapper, ncurses, Po4a, http-parser, jansson, docbook_xsl, docbook_xml_dtd_44, + nixosTests, withSudo ? false }: let @@ -12,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "1ik0x0b7s38d7n0aqhl31r0asxw6qcdb31hx9qydk87yg3n6rziv"; + sha256 = "sha256-AcfNm/0VpjD+Aa1ZUwI2EI/i0s06rxQCfabv3a/AM38="; }; postPatch = '' @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" - export PYTHONPATH=${ldap}/lib/python2.7/site-packages + export PYTHONPATH=$(find ${python3.pkgs.ldap} -type d -name site-packages) export PATH=$PATH:${openldap}/libexec configureFlagsArray=( @@ -40,7 +41,6 @@ stdenv.mkDerivation rec { --enable-pammoddir=$out/lib/security --with-os=fedora --with-pid-path=/run - --with-python2-bindings --with-python3-bindings --with-syslog=journald --without-selinux @@ -56,10 +56,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss - samba nfs-utils p11-kit python python3 popt + samba nfs-utils p11-kit python3 popt talloc tdb tevent ldb pam openldap pcre2 libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 - libuuid ldap systemd nspr check cmocka uid_wrapper + libuuid python3.pkgs.ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson ]; makeFlags = [ @@ -88,6 +88,8 @@ stdenv.mkDerivation rec { find "$out" -depth -type d -exec rmdir --ignore-fail-on-non-empty {} \; ''; + passthru.tests = { inherit (nixosTests) sssd sssd-ldap; }; + meta = with lib; { description = "System Security Services Daemon"; homepage = "https://sssd.io/"; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 37f9b0c4e06d..6f9e78799a03 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mikrotik-exporter-unstable"; - version = "2020-02-10"; + version = "2021-08-10"; src = fetchFromGitHub { owner = "nshttpd"; repo = "mikrotik-exporter"; - sha256 = "193zh06rqp9ybsnkxwmv7l4p2h2xisw4f01jjirshsb784j44bh6"; - rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f"; + sha256 = "1vqn1f159g0l76021gifbxpjf7zjhrj807qqqn51h5413lbi6r66"; + rev = "4bfa7adfef500ff621a677adfab1f7010af920d1"; }; - vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q"; + vendorSha256 = "0b244z3hly5726vwkr7vhdzzm2fi38cv1qh7nvfp3vpsxnii04md"; doCheck = false; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index b412c7bf46c8..57863a10529c 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.9"; + version = "0.39.12"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HcyzrGtBktScTPch6rCKj5Hr7VS9kf3cCHhDVaZKxG0="; + sha256 = "sha256-gtakdKnkzAU1yKtKnlkS+n8CbgftV64zLoENJKYjIAo="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index a08c02806e7d..24dc47176e89 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, fetchpatch , libiconv }: @@ -18,6 +19,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-xEASs6r5zxYJXS+at6aX5n0whGp5qwuNwq6Jh0GM+/4="; + patches = [ + (fetchpatch { + url = "https://github.com/orf/gping/commit/b843beb9617e4b7b98d4f6d3942067cad59c9d60.patch"; + sha256 = "sha256-9DIeeweCuGqymvUj4EBct82XVevkFSbHWaV76ExjGbs="; + }) + ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; meta = with lib; { diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 09ae25bbac1c..9fe00e4a4e9b 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.133"; + version = "1.0.134"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vF98v2tt786TlNo9YetkgYSrbZ20mvL8Y+pLLo2jD0Q="; + sha256 = "sha256-jcMaLp3SOeH6kE9V5fYSNP5klJwqWt3mrKz1VHOzjx4="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-+CBX4NUeeMXMXiVkJB56oHvC8usUDXWYZUseQvQaW6Y="; + vendorSha256 = "sha256-om9ASiMz59xaX76qByjziECuagCB+6jDBBsouEMQfe8="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 688fc6c6a003..2f254dd622dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10607,7 +10607,6 @@ with pkgs; sssd = callPackage ../os-specific/linux/sssd { inherit (perlPackages) Po4a; - inherit (python27Packages) ldap; }; sentry-cli = callPackage ../development/tools/sentry-cli { @@ -19241,6 +19240,8 @@ with pkgs; prime-server = callPackage ../development/libraries/prime-server { }; + primecount = callPackage ../development/libraries/science/math/primecount { }; + primesieve = callPackage ../development/libraries/science/math/primesieve { }; prison = callPackage ../development/libraries/prison { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f375f6dda845..133d6c0396b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10029,6 +10029,8 @@ in { vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; + vpk = callPackage ../development/python-modules/vpk { }; + vsts = callPackage ../development/python-modules/vsts { }; vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };