Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7319061eef4f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e5415d1cc59e
Choose a head ref

Commits on Apr 19, 2020

  1. bjumblr: init at 0.2

    magnetophon committed Apr 19, 2020
    Copy the full SHA
    f2402e5 View commit details

Commits on May 13, 2020

  1. chrome-gnome-shell: clean up

    * format with nixpkgs-fmt
    * reorder attributes
    * inline version
    jtojnar committed May 13, 2020
    Copy the full SHA
    c8683da View commit details
  2. chrome-gnome-shell: Fix missing introspection data

    It was crashing with:
    
        TypeError: gobject `__main__+ChromeGNOMEShell' doesn't support property `application_id'
    
    – that is the constructor of parent class Gio.Application does not recognize the kwarg.
    
    This is typically caused by missing pygobject overrides but I think ones for Gio are built-in into pygobject.
    
    Even weirder, adding just `${gobject-introspection}/lib/girepository-1.0` seems to fix the issue so it might be missing the whole typelib.
    But then why does not it fail when importing it?
    
    	from gi.repository import GLib, Gio
    
    For now, I am adding the Gio typelib which should been done from the start but more debugging should be done since weirdness like this can bring more bugs.
    
    Fixes: NixOS/nixpkgs#87740
    jtojnar committed May 13, 2020
    Copy the full SHA
    5df7471 View commit details

Commits on May 14, 2020

  1. firefox: 76.0 -> 76.0.1

    andir committed May 14, 2020
    Copy the full SHA
    b70435e View commit details
  2. nomachine-client: Add archive.org to source urls

    NoMachine removes each old release as soon as a new one is available,
    resulting in failed downloads. Thankfully, the Internet Archive
    provides backups of old downloads, so we can use it as a fallback.
    talyz committed May 14, 2020
    Copy the full SHA
    022f2cc View commit details

Commits on May 15, 2020

  1. uwsgi: make instance configuration deeply mergeable

    allows to specify independent uwsgi instances in two modules.
    Mic92 committed May 15, 2020
    Copy the full SHA
    b96a4dc View commit details
  2. jugglinglab: init at 1.2

    wnklmnn committed May 15, 2020
    Copy the full SHA
    8f475b0 View commit details
  3. fly: use completion generator

    There's no need to ship the pre-generated completions in the nixpkgs
    tree anymore.
    flokli committed May 15, 2020
    Copy the full SHA
    5d362c2 View commit details
  4. fly: 6.0.0 -> 6.1.0

    flokli committed May 15, 2020
    Copy the full SHA
    44c0533 View commit details
  5. Copy the full SHA
    b94e8cc View commit details
  6. starship: 0.41.1 -> 0.41.3

    bbigras committed May 15, 2020
    Copy the full SHA
    48c4f43 View commit details
  7. Copy the full SHA
    7517299 View commit details
  8. colmap: update boost to 1.72 to fix build

    matthuszagh authored and Jon committed May 15, 2020
    Copy the full SHA
    e8215cd View commit details
  9. Merge pull request #87843 from talyz/nomachine-archive

    nomachine-client: Add archive.org to source urls
    talyz authored May 15, 2020
    Copy the full SHA
    ecb1d7d View commit details
  10. polybar: 3.4.2 -> 3.4.3

    Br1ght0ne authored and Jon committed May 15, 2020
    Copy the full SHA
    55242c1 View commit details
  11. go-tools: 2020.1.3 -> 2020.1.4

    marsam authored and Jon committed May 15, 2020
    Copy the full SHA
    202ded0 View commit details
  12. Copy the full SHA
    6b17638 View commit details
  13. glade: format with nixpkgs-fmt

    also switch away from dependency aliases and reorder the attributes a bit
    jtojnar committed May 15, 2020
    Copy the full SHA
    fe7e564 View commit details
  14. Copy the full SHA
    e20c329 View commit details
  15. Revert "Get rid of go 1.13 (#86036)"

    This partially reverts commit 3e0aa4a.
    
    See the discussion in the PR.
    zimbatm committed May 15, 2020
    Copy the full SHA
    99efa7c View commit details
  16. Merge pull request #87811 from andir/firefox

    firefox: 76.0 -> 76.0.1
    andir authored May 15, 2020
    Copy the full SHA
    b0774e2 View commit details
  17. Merge pull request #87202 from r-ryantm/auto-update/glade

    gnome3.glade: 3.22.2 -> 3.36.0
    hedning authored May 15, 2020
    Copy the full SHA
    59e2e44 View commit details
  18. LTS Haskell 15.12

    peti committed May 15, 2020
    Copy the full SHA
    cf8bd2c View commit details
  19. Copy the full SHA
    ca8cb60 View commit details
  20. hackage-packages.nix: automatic Haskell package set update

    This update was generated by hackage2nix v2.15.3-1-gb7c82db from Hackage revision
    commercialhaskell/all-cabal-hashes@4c409c7.
    peti committed May 15, 2020
    Copy the full SHA
    730024f View commit details
  21. hackagePackages.neuron: Fix build

    maralorn authored and peti committed May 15, 2020
    Copy the full SHA
    a61cf82 View commit details
  22. Copy the full SHA
    dcbcd74 View commit details
  23. Copy the full SHA
    4ed93cc View commit details
  24. haskell/generic-builder.nix: Fix C lib multiple inclusions

    Allow the darwin links code to overwrite libs that were already
    copied, because C dependencies can occur multiple times.
    
    Solves errors like
    
        ln: failed to create symbolic link '/nix/store/higpc9xavwcjjzdipz7m9ly03bh7iy2z-hercules-ci-agent-source-0.7.0/lib/links/libboost_context.dylib': File exists
    roberth authored and peti committed May 15, 2020
    Copy the full SHA
    4353027 View commit details
  25. ghcjs: mark build as broken

    ghcjs hasn't compiled for several weeks.
    peti committed May 15, 2020
    Copy the full SHA
    e037eb4 View commit details
  26. Copy the full SHA
    a4282b6 View commit details
  27. Merge pull request #87885 from flokli/fly-6.1.0

    fly: 6.0.0 -> 6.1.0
    flokli authored May 15, 2020
    Copy the full SHA
    b611581 View commit details
  28. Merge pull request #87805 from NixOS/haskell-updates

    Update Haskell package set to LTS 15.12 (plus other fixes)
    peti authored May 15, 2020
    Copy the full SHA
    5e6f290 View commit details
  29. ocamlPackages.ipaddr: remove at 2.6.1

    This is a legacy version for OCaml 4.02
    vbgl committed May 15, 2020
    Copy the full SHA
    a91007d View commit details
  30. Copy the full SHA
    8476545 View commit details
  31. doc: Rewrite python onboarding tutorials in manual

    Based on some feedback in #87094 and discussion with @FRidh, this re-organizes
    the onboarding tutorial in the Nixpkgs manual's python section, so that we start
    with the simplest, most ad-hoc examples and work our way up. This progresses
    from:
    
    1. How to create an temporary python env at the cmdline, then
    2. How to create a specific python env for a single script, then
    3. How to create a specific python env for a project in a shell.nix, then
    4. How to install a specific python env globally on the system or in a user profile.
    
    Additionally, I've tried to standardize on some of the "best practice" ways of
    doing things:
    
    1. Instead of saying that this command style is "supported but strongly not
       discouraged", I've just deleted it to avoid confusion.
    
       Bad:  nix-shell -p python38Packages.numpy python38Packages.toolz
       Good: nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])'
    
    2. In the portion where we show how to add stuff to the user's
       `XDG_CONFIG_HOME`, use overlays instead of `config.nix`. The former can do
       everything the latter can do, but is also much more generic and powerful,
       because it can compose with other files, compose with other envs, compose
       with overlays that do things like swap whether tensorflow and pytorch are
       built openblas/mkl/cuda stacks, and so on. The user is eventually going to
       see the overlay, so to avoid confusion let's standardize on it.
    bhipple authored and FRidh committed May 15, 2020
    Copy the full SHA
    c882907 View commit details
  32. Copy the full SHA
    32b8ed7 View commit details
  33. rkt: remove

    zowoq committed May 15, 2020
    Copy the full SHA
    5195aed View commit details

Commits on May 16, 2020

  1. Copy the full SHA
    d18d18a View commit details
  2. Copy the full SHA
    6fd700a View commit details
  3. Copy the full SHA
    2c74af6 View commit details
  4. Merge pull request #87875 from wnklmnn/jugglinglab

    jugglinglab: init at 1.2
    cdepillabout authored May 16, 2020
    Copy the full SHA
    8226394 View commit details
  5. Merge pull request #84241 from magnetophon/bjumblr

    bjumblr: init at 0.2
    AndersonTorres authored May 16, 2020
    Copy the full SHA
    33dd04e View commit details
  6. Copy the full SHA
    89b6d5f View commit details
  7. Copy the full SHA
    b15831b View commit details
  8. Copy the full SHA
    3233d3f View commit details
  9. python3Packages.venvShellHook: add postVenvCreation (#87850)

    * python3Packages.venvShellHook: add postVenvCreation
    
    * python: docs: add postVenvCreation explaination
    Jon authored May 16, 2020
    Copy the full SHA
    15b3d9d View commit details
  10. Copy the full SHA
    21351cf View commit details
  11. Copy the full SHA
    2cbfe21 View commit details
  12. Merge pull request #87926 from zowoq/codeowners-podman

    .github/CODEOWNERS: add podman team
    adisbladis authored May 16, 2020
    Copy the full SHA
    e5415d1 View commit details
Showing with 2,382 additions and 1,367 deletions.
  1. +6 −0 .github/CODEOWNERS
  2. +264 −140 doc/languages-frameworks/python.section.md
  3. +6 −0 maintainers/maintainer-list.nix
  4. +5 −0 nixos/doc/manual/release-notes/rl-2009.xml
  5. +0 −1 nixos/modules/module-list.nix
  6. +1 −0 nixos/modules/rename.nix
  7. +19 −1 nixos/modules/services/web-servers/uwsgi.nix
  8. +0 −64 nixos/modules/virtualisation/rkt.nix
  9. +28 −0 pkgs/applications/audio/bjumblr/default.nix
  10. +1 −3 pkgs/applications/editors/emacs-modes/manual-packages.nix
  11. +0 −32 pkgs/applications/editors/emacs-modes/ocaml/default.nix
  12. +2 −1 pkgs/applications/editors/gnome-builder/default.nix
  13. +2 −2 pkgs/applications/misc/polybar/default.nix
  14. +1 −1 pkgs/applications/misc/xterm/default.nix
  15. +2 −2 pkgs/applications/networking/browsers/firefox/packages.nix
  16. +2 −2 pkgs/applications/science/misc/colmap/default.nix
  17. +0 −78 pkgs/applications/virtualization/rkt/default.nix
  18. +2 −2 pkgs/data/misc/hackage/default.nix
  19. +0 −37 pkgs/desktops/gnome-3/apps/glade/default.nix
  20. +2 −2 pkgs/desktops/gnome-3/default.nix
  21. +39 −12 pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
  22. +2 −1 pkgs/development/compilers/ghcjs-ng/default.nix
  23. +244 −0 pkgs/development/compilers/go/1.13.nix
  24. +6 −2 pkgs/development/haskell-modules/configuration-common.nix
  25. +1 −1 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
  26. +33 −28 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  27. +20 −0 pkgs/development/haskell-modules/configuration-nix.nix
  28. +2 −1 pkgs/development/haskell-modules/generic-builder.nix
  29. +1,510 −852 pkgs/development/haskell-modules/hackage-packages.nix
  30. +4 −2 pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
  31. +1 −1 pkgs/development/libraries/gamin/default.nix
  32. +3 −3 pkgs/development/libraries/libexecinfo/default.nix
  33. +13 −3 pkgs/development/libraries/libhandy/default.nix
  34. +0 −32 pkgs/development/ocaml-modules/ipaddr/2.6.1.nix
  35. +9 −11 pkgs/development/tools/continuous-integration/fly/default.nix
  36. +0 −10 pkgs/development/tools/continuous-integration/fly/fly.bash
  37. +65 −0 pkgs/development/tools/glade/default.nix
  38. +2 −4 pkgs/development/tools/go-tools/default.nix
  39. +2 −2 pkgs/os-specific/linux/apparmor/default.nix
  40. +9 −9 pkgs/os-specific/linux/kernel/hardened/patches.json
  41. +3 −3 pkgs/os-specific/linux/lvm2/default.nix
  42. +2 −2 pkgs/os-specific/linux/musl/default.nix
  43. +2 −2 pkgs/os-specific/linux/pam/default.nix
  44. +1 −1 pkgs/os-specific/linux/powertop/default.nix
  45. +1 −1 pkgs/servers/monitoring/net-snmp/default.nix
  46. +1 −1 pkgs/shells/tcsh/default.nix
  47. +8 −2 pkgs/tools/admin/nomachine-client/default.nix
  48. +1 −1 pkgs/tools/misc/figlet/default.nix
  49. +30 −0 pkgs/tools/misc/jugglinglab/default.nix
  50. +3 −3 pkgs/tools/misc/starship/default.nix
  51. +1 −1 pkgs/tools/networking/vde2/default.nix
  52. +1 −0 pkgs/top-level/aliases.nix
  53. +19 −2 pkgs/top-level/all-packages.nix
  54. +1 −6 pkgs/top-level/ocaml-packages.nix
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -187,3 +187,9 @@
/pkgs/build-support/build-pecl.nix @etu
/pkgs/development/interpreters/php @etu
/pkgs/top-level/php-packages.nix @etu

# Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @NixOS/podman
/nixos/modules/virtualisation/cri-o.nix @NixOS/podman
/nixos/modules/virtualisation/podman.nix @NixOS/podman
/nixos/tests/podman.nix @NixOS/podman
Loading