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: 91fa6990b250
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: 67bc63f9a7ac
Choose a head ref
19 contributors

Commits on Apr 3, 2019

  1. linux: 4.4.177 -> 4.4.178 

    (cherry picked from commit 84fc0fb)
    @NeQuissimus
    NeQuissimus committed Apr 3, 2019
    Copy the full SHA
    608461e View commit details

  2. linux: 4.9.166 -> 4.9.167 

    (cherry picked from commit e731fea)
    @NeQuissimus
    NeQuissimus committed Apr 3, 2019
    Copy the full SHA
    eec4ec6 View commit details

  3. linux: 4.14.109 -> 4.14.110 

    (cherry picked from commit c0d537c)
    @NeQuissimus
    NeQuissimus committed Apr 3, 2019
    Copy the full SHA
    d1c8992 View commit details

  4. linux: 4.19.32 -> 4.19.33 

    (cherry picked from commit 4a91a6e)
    @NeQuissimus
    NeQuissimus committed Apr 3, 2019
    Copy the full SHA
    f3e91db View commit details

  5. linux: 5.0.5 -> 5.0.6 

    (cherry picked from commit 0bb32d2)
    @NeQuissimus
    NeQuissimus committed Apr 3, 2019
    Copy the full SHA
    db4bdf1 View commit details

  6. pantheon.wingpanel-indicator-datetime: launch elementary-calendar whe… 

    …n in PATH

One less downstream patch :)

(cherry picked from commit b3e8b01)
    @worldofpeace
    worldofpeace committed Apr 3, 2019
    Copy the full SHA
    52c2e78 View commit details

  7. gnome3.mutter328: use gnome-3-28 branch 

    Probably should get these patches in while
I'm stuck with this. Alternative would be to
fetch the patches individually.

pipewire was accidentally in buildInputs when it has
been disabled

Changes: https://gitlab.gnome.org/GNOME/mutter/compare/3.28.3...gnome-3-28
(cherry picked from commit 874856a)
    @worldofpeace
    worldofpeace committed Apr 3, 2019
    Copy the full SHA
    d28aedd View commit details

  8. gnome3.mutter328: hardcode path to zenity 

    (cherry picked from commit c4df832)
    @worldofpeace
    worldofpeace committed Apr 3, 2019
    Copy the full SHA
    c089e05 View commit details

  9. gnome3.mutter328: use wrapGAppsHook 

    (cherry picked from commit 7fe664c)
    @worldofpeace
    worldofpeace committed Apr 3, 2019
    Copy the full SHA
    4fe8a27 View commit details

Commits on Apr 4, 2019

  1. root5: fix build 

    (cherry picked from commit c36f841)
    @veprbl
    veprbl committed Apr 4, 2019
    Copy the full SHA
    3ba0f35 View commit details

  2. applgrid: fix build for gcc 

    (cherry picked from commit cdab07b)
    @veprbl
    veprbl committed Apr 4, 2019
    Copy the full SHA
    a6ee6a5 View commit details

  3. nixos/icingaweb2: Replace most options with toINI 

    (cherry picked from commit b0daedd)

If people start relying on the many options added in
NixOS/nixpkgs#55957 for 19.03, we wouldn't have any
chance to ever remove them.
    @dasJ @infinisil
    dasJ authored and infinisil committed Apr 4, 2019
    Copy the full SHA
    8569d30 View commit details

  4. calligra: fix build 

    (cherry picked from commit 396dcdf)
    @cpages
    cpages committed Apr 4, 2019
    Copy the full SHA
    435c3ce View commit details

  5. calligra: mark broken 

    Fails to start, kde home not found.

(cherry picked from commit 4434689)
    @cpages
    cpages committed Apr 4, 2019
    Copy the full SHA
    d97776b View commit details

Commits on Apr 5, 2019

  1. firmware-linux-nonfree: 2019-02-13 -> 2019-03-12 

    (cherry picked from commit 72a6438)
    @bendlas
    bendlas committed Apr 5, 2019
    Copy the full SHA
    32b76e8 View commit details

  2. i2p: 0.9.38 -> 0.9.39 

    (cherry picked from commit 098fd32)
    @bendlas
    bendlas committed Apr 5, 2019
    Copy the full SHA
    ed57cf5 View commit details

  3. linuxPackages.vhba: 20170610 -> 20190302 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vhba/versions

(cherry picked from commit 794e864)
    @r-ryantm @bendlas
    r-ryantm authored and bendlas committed Apr 5, 2019
    Copy the full SHA
    d1bb058 View commit details

  4. cdemu: update to 3.2 release 

    closes NixOS/nixpkgs#58911

(cherry picked from commit 79d653b)
    @bendlas
    bendlas committed Apr 5, 2019
    Copy the full SHA
    bbda35a View commit details

  5. grafana: 6.0.2 -> 6.1.0 (#58917) 

    (cherry picked from commit cfe5698)
    @WilliButz @globin
    WilliButz authored and globin committed Apr 5, 2019
    Copy the full SHA
    776b304 View commit details

  6. grafana: 6.1.0 -> 6.1.1 

    (cherry picked from commit 26d41fb)
    @WilliButz @globin
    WilliButz authored and globin committed Apr 5, 2019
    Copy the full SHA
    5a16b0a View commit details

  7. chromium: 73.0.3683.86 -> 73.0.3683.103 

    (cherry picked from commit a5960f7)
    @bendlas
    bendlas committed Apr 5, 2019
    Copy the full SHA
    cd7adda View commit details

  8. vscode: 1.32.2 -> 1.32.3 (#57720) 

    (cherry picked from commit 2c6876d)
    @eadwu @globin
    eadwu authored and globin committed Apr 5, 2019
    Copy the full SHA
    185b5e3 View commit details

  9. vscode: 1.32.3 -> 1.33.0 

    https://code.visualstudio.com/updates/v1_33
(cherry picked from commit 3622597)
    @worldofpeace @globin
    worldofpeace authored and globin committed Apr 5, 2019
    Copy the full SHA
    8c8856c View commit details

  10. nauty: disable cpu feature detection 

    (cherry picked from commit 7f22a42)
    @timokau @globin
    timokau authored and globin committed Apr 5, 2019
    Copy the full SHA
    833d593 View commit details

  11. gramps: fix build 

    (cherry picked from commit 298f3d6)
    @globin
    Nathan van Doorn authored and globin committed Apr 5, 2019
    Copy the full SHA
    03098dc View commit details

  12. souffle: 1.2.0 -> 1.5.1, co-maintain 

    Souffle has seen some significant upgrades in the past few years and now
has trimmed and replaced several of its more expensive dependencies,
such as boost, openjdk, etc.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 4f74e3a)

Backporting this as it was broken in 19.03.
    @thoughtpolice @globin
    thoughtpolice authored and globin committed Apr 5, 2019
    Copy the full SHA
    bc7de5b View commit details

  13. mosquitto: 1.5.5 -> 1.5.8 and add systemd support 

    (cherry picked from commit 5638a1c)
    @peterhoeg @globin
    peterhoeg authored and globin committed Apr 5, 2019
    Copy the full SHA
    ce16af3 View commit details

  14. python.pkgs.ldappool: fix build 

    (cherry picked from commit 836621f)
    Robert Schütz committed Apr 5, 2019
    Copy the full SHA
    6faf326 View commit details

Commits on Apr 6, 2019

  1. Revert "Merge #57010: Luarocks update" 

    This reverts commit 4fff94f.
I assumed this would fix more things than break, but apparently not.
Fixes #59057.
    @vcunat
    vcunat committed Apr 6, 2019
    Copy the full SHA
    dc58b3a View commit details

  2. qlcplus: fix location of libraries for fixup 

    (cherry picked from commit 1520bed)
    @fpletz
    fpletz committed Apr 6, 2019
    Copy the full SHA
    215e971 View commit details

  3. proxmark3: init at 3.1.0 

    (cherry picked from commit 4a985a6)
    @fpletz
    fpletz committed Apr 6, 2019
    Copy the full SHA
    cd39bc9 View commit details

  4. linux: 4.14.110 -> 4.14.111 

    (cherry picked from commit b60ce2e)
    @NeQuissimus
    NeQuissimus committed Apr 6, 2019
    Copy the full SHA
    00e27d4 View commit details

  5. linux: 4.19.33 -> 4.19.34 

    (cherry picked from commit c45589b)
    @NeQuissimus
    NeQuissimus committed Apr 6, 2019
    Copy the full SHA
    8aceb56 View commit details

  6. linux: 4.9.167 -> 4.9.168 

    (cherry picked from commit 21373e9)
    @NeQuissimus
    NeQuissimus committed Apr 6, 2019
    Copy the full SHA
    12e0b24 View commit details

  7. linux: 5.0.6 -> 5.0.7 

    (cherry picked from commit eedb7e7)
    @NeQuissimus
    NeQuissimus committed Apr 6, 2019
    Copy the full SHA
    1cc3696 View commit details

  8. dockerTools: storePathToLayer use runtimeShell in script 

    (cherry picked from commit 5d429f6)
    @nlewo
    Jaka Hudoklin authored and nlewo committed Apr 6, 2019
    Copy the full SHA
    0d8ecd3 View commit details

  9. jenkins: 2.150.1 -> 2.164.1 

    (cherry picked from commit e9994af)
    @NeQuissimus
    NeQuissimus committed Apr 6, 2019
    Copy the full SHA
    fdc7b8a View commit details

  10. nixos/httpd: replace ssmtp with system-sendmail 

    (cherry picked from commit 9c9a6f3)
    @aanderse @Ekleog
    aanderse authored and Ekleog committed Apr 6, 2019
    Copy the full SHA
    67bc63f View commit details
Showing with 635 additions and 662 deletions.
  1. +7 −8 maintainers/scripts/luarocks-packages.csv
  2. +10 −16 maintainers/scripts/update-luarocks-packages
  3. +90 −473 nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
  4. +1 −4 nixos/modules/services/web-servers/apache-httpd/default.nix
  5. +4 −4 pkgs/applications/editors/vscode/default.nix
  6. +2 −2 pkgs/applications/misc/gramps/default.nix
  7. +6 −0 pkgs/applications/misc/qlcplus/default.nix
  8. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  9. +2 −0 pkgs/applications/office/calligra/default.nix
  10. +12 −1 pkgs/applications/science/math/nauty/default.nix
  11. +20 −4 pkgs/applications/science/misc/root/5.nix
  12. +27 −0 pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch
  13. +204 −0 pkgs/applications/science/misc/root/purify_include_paths_root5.patch
  14. +1 −1 pkgs/build-support/docker/default.nix
  15. +1 −1 pkgs/build-support/docker/store-path-to-layer.sh
  16. +19 −14 pkgs/desktops/gnome-3/core/mutter/3.28.nix
  17. +13 −0 pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch
  18. +0 −13 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch
  19. +10 −4 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
  20. +28 −15 pkgs/development/compilers/souffle/default.nix
  21. +11 −0 pkgs/development/libraries/physics/applgrid/bad_code.patch
  22. +7 −2 pkgs/development/python-modules/ldappool/default.nix
  23. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
  24. +25 −25 pkgs/development/tools/misc/luarocks/darwin.patch
  25. +6 −3 pkgs/development/tools/misc/luarocks/default.nix
  26. +2 −3 pkgs/development/tools/misc/luarocks/luarocks-nix.nix
  27. +10 −5 pkgs/misc/emulators/cdemu/analyzer.nix
  28. +4 −4 pkgs/misc/emulators/cdemu/client.nix
  29. +4 −4 pkgs/misc/emulators/cdemu/daemon.nix
  30. +6 −4 pkgs/misc/emulators/cdemu/gui.nix
  31. +12 −3 pkgs/misc/emulators/cdemu/libmirage.nix
  32. +2 −2 pkgs/misc/emulators/cdemu/vhba.nix
  33. +3 −7 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
  34. +2 −3 pkgs/os-specific/linux/kernel/linux-4.14.nix
  35. +2 −3 pkgs/os-specific/linux/kernel/linux-4.19.nix
  36. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  37. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  38. +2 −3 pkgs/os-specific/linux/kernel/linux-5.0.nix
  39. +3 −3 pkgs/servers/monitoring/grafana/default.nix
  40. +18 −10 pkgs/servers/mqtt/mosquitto/default.nix
  41. +2 −2 pkgs/tools/networking/i2p/default.nix
  42. +37 −0 pkgs/tools/security/proxmark3/default.nix
  43. +3 −0 pkgs/top-level/all-packages.nix
  44. +2 −1 pkgs/top-level/lua-packages.nix
15 changes: 7 additions & 8 deletions maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# nix name, luarocks name, server, version/additionnal args
ansicolors,
argparse,
basexx,
@@ -18,15 +17,15 @@ lua-term,
luabitop,
luaevent,
luacheck
luaffi,,http://luarocks.org/dev,
luaffi,http://luarocks.org/dev,
luuid,
penlight,
say,
luv,
luasystem,
mediator_lua,,http://luarocks.org/manifests/teto
mpack,,http://luarocks.org/manifests/teto
nvim-client,,http://luarocks.org/manifests/teto
busted,,http://luarocks.org/manifests/teto
luassert,,http://luarocks.org/manifests/teto
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1
mediator_lua,http://luarocks.org/manifests/teto
mpack,http://luarocks.org/manifests/teto
nvim-client,http://luarocks.org/manifests/teto
busted,http://luarocks.org/manifests/teto
luassert,http://luarocks.org/manifests/teto
coxpcall,https://luarocks.org/manifests/hisham,1.17.0-1
26 changes: 10 additions & 16 deletions maintainers/scripts/update-luarocks-packages
View file
Original file line number Diff line number Diff line change
@@ -74,18 +74,17 @@ FOOTER="


function convert_pkg () {
nix_pkg_name="$1"
lua_pkg_name="$2"
pkg="$1"
server=""
if [ ! -z "$3" ]; then
server=" --server=$3"
if [ ! -z "$2" ]; then
server=" --server=$2"
fi

version="${3:-}"

echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2
cmd="luarocks nix $server $lua_pkg_name $version"
drv="$nix_pkg_name = $($cmd)"
echo "looking at $pkg (version $version) from server [$server]" >&2
cmd="luarocks nix $server $pkg $version"
drv="$($cmd)"
if [ $? -ne 0 ]; then
echo "Failed to convert $pkg" >&2
echo "$drv" >&2
@@ -99,17 +98,12 @@ echo "$HEADER" | tee "$TMP_FILE"

# list of packages with format
# name,server,version
while IFS=, read -r nix_pkg_name lua_pkg_name server version
while IFS=, read -r pkg_name server version
do
if [ "${nix_pkg_name:0:1}" == "#" ]; then
echo "Skipping comment ${nix_pkg_name}" >&2
continue
if [ -z "$pkg_name" ]; then
echo "Skipping empty package name" >&2
fi
if [ -z "$lua_pkg_name" ]; then
echo "Using nix_name as lua_pkg_name" >&2
lua_pkg_name="$nix_pkg_name"
fi
convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version"
convert_pkg "$pkg_name" "$server" "$version"
done < "$CSV_FILE"

# close the set
Loading