Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ca65d6f7d263
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f4d95bbc2f7
Choose a head ref
14 contributors

Commits on Apr 20, 2021

  1. python3Packages.archinfo: 9.0.6281 -> 9.0.6790

    @fabaff
    fabaff committed Apr 20, 2021
    Copy the full SHA
    060f432 View commit details

  2. python3Packages.ailment: 9.0.6281 -> 9.0.6790

    @fabaff
    fabaff committed Apr 20, 2021
    Copy the full SHA
    d3346f5 View commit details

  3. python3Packages.claripy: 9.0.6281 -> 9.0.6790

    @fabaff
    fabaff committed Apr 20, 2021
    Copy the full SHA
    cc8ecf2 View commit details

  4. python3Packages.cle: 9.0.6281 -> 9.0.6790

    @fabaff
    fabaff committed Apr 20, 2021
    Copy the full SHA
    4f737c0 View commit details

  5. python3Packages.angr: 9.0.6281 -> 9.0.6790

    @fabaff
    fabaff committed Apr 20, 2021
    Copy the full SHA
    6c28f4a View commit details

Commits on Apr 21, 2021

  1. python3Packages.pyvex: 9.0.6281 -> 9.0.6790

    @fabaff
    fabaff committed Apr 21, 2021
    Copy the full SHA
    2440917 View commit details

Commits on Apr 22, 2021

  1. bettercap: 2.30.2 -> 2.31.0

    @r-ryantm
    r-ryantm committed Apr 22, 2021
    Copy the full SHA
    6d918ca View commit details

  2. clingo: 5.4.1 -> 5.5.0

    @r-ryantm
    r-ryantm committed Apr 22, 2021
    Copy the full SHA
    82bc3d6 View commit details

  3. bettercap: specify license

    @fabaff
    fabaff authored Apr 22, 2021
    Copy the full SHA
    c3a8a76 View commit details

  4. freeimage: fix for darwin

    @veprbl
    veprbl committed Apr 22, 2021
    Copy the full SHA
    a157fc8 View commit details

  5. libreoffice: kill private dbus instance on exit 

    if the libreoffice wrapper doesn't find a dbus instance in the
environment it starts one, but then neglects to clean it up. over time
this can litter the system with orphaned dbus instances. kill the daemon
as well instead of just removing the socket directory.
    @pennae
    pennae committed Apr 22, 2021
    Copy the full SHA
    df6c714 View commit details

Commits on Apr 23, 2021

  1. doc/contributing/*.xml: Convert to markdown

    @bobby285271
    bobby285271 committed Apr 23, 2021
    Copy the full SHA
    0fd5556 View commit details

  2. python3Packages.openerz-api: init at 0.1.0

    @fabaff
    fabaff committed Apr 23, 2021
    Copy the full SHA
    8916835 View commit details

  3. home-assistant: update component-packages

    @fabaff
    fabaff committed Apr 23, 2021
    Copy the full SHA
    907d65b View commit details

  4. home-assistant: enable openerz tests

    @fabaff
    fabaff committed Apr 23, 2021
    Copy the full SHA
    40d82c7 View commit details

  5. broot: 1.2.0 -> 1.2.9

    @happysalada @bjornfor
    happysalada authored and bjornfor committed Apr 23, 2021
    Copy the full SHA
    8b23026 View commit details

  6. trilium: 0.46.7 -> 0.46.9

    @FliegendeWurst @bjornfor
    FliegendeWurst authored and bjornfor committed Apr 23, 2021
    Copy the full SHA
    961f7ca View commit details

  7. xplr: 0.5.5 -> 0.5.6

    @sayanarijit @bjornfor
    sayanarijit authored and bjornfor committed Apr 23, 2021
    Copy the full SHA
    32a537c View commit details

  8. Merge pull request #119894 from fabaff/bump-angr 

    python3Packages.angr: 9.0.6281 -> 9.0.6790 and dependencies
    @fabaff
    fabaff authored Apr 23, 2021
    Copy the full SHA
    1f7c83a View commit details

  9. Merge pull request #120262 from fabaff/openerz-api 

    python3Packages.openerz-api: init at 0.1.0
    @fabaff
    fabaff authored Apr 23, 2021
    Copy the full SHA
    e097a35 View commit details

  10. Merge pull request #120298 from bobby285271/issue-120011 

    doc: Convert contributing/* to markdown
    @Mic92
    Mic92 authored Apr 23, 2021
    Copy the full SHA
    8def3d6 View commit details

  11. cargo-make: fix darwin build (#120312) 

    * cargo-make: format with nixpkgs-fmt

* cargo-make: fix darwin build
    @happysalada
    happysalada authored Apr 23, 2021
    Copy the full SHA
    8e585bb View commit details

  12. Merge pull request #120150 from r-ryantm/auto-update/bettercap 

    bettercap: 2.30.2 -> 2.31.0
    @fabaff
    fabaff authored Apr 23, 2021
    Copy the full SHA
    c312d8b View commit details

  13. Merge pull request #120222 from pennae/libreoffice-dbus 

    libreoffice: kill private dbus instance on exit
    @7c6f434c
    7c6f434c authored Apr 23, 2021
    Copy the full SHA
    d2d3068 View commit details

  14. Merge pull request #120168 from r-ryantm/auto-update/clingo 

    clingo: 5.4.1 -> 5.5.0
    @7c6f434c
    7c6f434c authored Apr 23, 2021
    Copy the full SHA
    2a04a9c View commit details

  15. chromiumDev: 91.0.4472.19 -> 92.0.4484.7

    @primeos
    primeos committed Apr 23, 2021
    Copy the full SHA
    a75b5ad View commit details

  16. maintainers: add progval

    @progval @alyssais
    progval authored and alyssais committed Apr 23, 2021
    Copy the full SHA
    9bb6bf6 View commit details

  17. mrustc: init at 0.9 

    mrustc is mostly patched to use shared LLVM sources but still uses
in-tree source for compiler-rt from LLVM 7. This needs to be patched to
compile under glibc 2.31 or later. It's easy enough to reapply all our
compiler-rt patches here.
    @progval @alyssais
    progval authored and alyssais committed Apr 23, 2021
    Copy the full SHA
    92c7773 View commit details

  18. Merge pull request #120321 from primeos/chromiumDev 

    chromiumDev: 91.0.4472.19 -> 92.0.4484.7
    @primeos
    primeos authored Apr 23, 2021
    Copy the full SHA
    112a3b0 View commit details

  19. Merge pull request #120124 from veprbl/pr/freeimage_fix 

    freeimage: fix for darwin
    @veprbl
    veprbl authored Apr 23, 2021
    Copy the full SHA
    638936f View commit details

  20. Merge remote-tracking branch 'nixpkgs/master' into staging-next 

    Conflicts:
	pkgs/development/python-modules/pyvex/default.nix
	pkgs/top-level/python-packages.nix
    @alyssais
    alyssais committed Apr 23, 2021
    Copy the full SHA
    4f4d95b View commit details
Showing with 1,245 additions and 1,658 deletions.
  1. +514 −0 doc/contributing/coding-conventions.chapter.md
  2. +0 −943 doc/contributing/coding-conventions.xml
  3. +24 −0 doc/contributing/contributing-to-documentation.chapter.md
  4. +0 −30 doc/contributing/contributing-to-documentation.xml
  5. +77 −0 doc/contributing/quick-start.chapter.md
  6. +0 −152 doc/contributing/quick-start.xml
  7. +204 −0 doc/contributing/reviewing-contributions.chapter.md
  8. +0 −488 doc/contributing/reviewing-contributions.xml
  9. +4 −4 doc/manual.xml
  10. +6 −0 maintainers/maintainer-list.nix
  11. +3 −3 pkgs/applications/misc/xplr/default.nix
  12. +3 −3 pkgs/applications/networking/browsers/chromium/upstream-info.json
  13. +3 −2 pkgs/applications/office/libreoffice/wrapper.sh
  14. +3 −3 pkgs/applications/office/trilium/default.nix
  15. +2 −2 pkgs/applications/science/logic/potassco/clingo.nix
  16. +153 −0 pkgs/development/compilers/mrustc/bootstrap.nix
  17. +53 −0 pkgs/development/compilers/mrustc/default.nix
  18. +39 −0 pkgs/development/compilers/mrustc/minicargo.nix
  19. +12 −0 pkgs/development/compilers/mrustc/patches/0001-use-shared-llvm.patch
  20. +14 −0 pkgs/development/compilers/mrustc/patches/0002-dont-build-llvm.patch
  21. +13 −0 pkgs/development/compilers/mrustc/patches/0003-echo-newlines.patch
  22. +28 −0 pkgs/development/compilers/mrustc/patches/0004-increase-parallelism.patch
  23. +4 −0 pkgs/development/libraries/freeimage/default.nix
  24. +2 −2 pkgs/development/python-modules/ailment/default.nix
  25. +2 −3 pkgs/development/python-modules/angr/default.nix
  26. +2 −2 pkgs/development/python-modules/archinfo/default.nix
  27. +2 −2 pkgs/development/python-modules/claripy/default.nix
  28. +4 −2 pkgs/development/python-modules/cle/default.nix
  29. +39 −0 pkgs/development/python-modules/openerz-api/default.nix
  30. +4 −5 pkgs/development/python-modules/pyvex/default.nix
  31. +11 −2 pkgs/development/tools/rust/cargo-make/default.nix
  32. +1 −1 pkgs/servers/home-assistant/component-packages.nix
  33. +1 −0 pkgs/servers/home-assistant/default.nix
  34. +5 −4 pkgs/tools/misc/broot/default.nix
  35. +7 −5 pkgs/tools/security/bettercap/default.nix
  36. +4 −0 pkgs/top-level/all-packages.nix
  37. +2 −0 pkgs/top-level/python-packages.nix
Loading