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: e6a37ef446f7
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: cb2cdab71368
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 12, 2019

  1. qscintilla: Fix qt4 build 

     (#73163)
(cherry picked from commit eb1cd0d)
    @lsix @c0bw3b
    lsix authored and c0bw3b committed Nov 12, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    191dc25 View commit details

Commits on Nov 13, 2019

  1. moodle: 3.7.2 -> 3.7.3 

    (cherry picked from commit afe2883)
    @aanderse @bjornfor
    aanderse authored and bjornfor committed Nov 13, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb2cdab View commit details
1 change: 0 additions & 1 deletion pkgs/development/libraries/qscintilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,6 +73,5 @@ in stdenv.mkDerivation rec {
license = with licenses; [ gpl2 gpl3 ]; # and commercial
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
broken = !withQt5;
};
}
6 changes: 3 additions & 3 deletions pkgs/development/libraries/qscintilla/fix-qt4-build.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -ur QScintilla_gpl-2.9.4/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.9.4-fix/Qt4Qt5/Qsci/qsciscintillabase.h
--- QScintilla_gpl-2.9.4/Qt4Qt5/Qsci/qsciscintillabase.h 2016-12-25 23:01:54.000000000 +0100
+++ QScintilla_gpl-2.9.4-fix/Qt4Qt5/Qsci/qsciscintillabase.h 2019-10-22 09:07:55.429260135 +0200
diff -ur Qt4Qt5/Qsci/qsciscintillabase.h Qt4Qt5/Qsci/qsciscintillabase.h
--- Qt4Qt5/Qsci/qsciscintillabase.h 2016-12-25 23:01:54.000000000 +0100
+++ Qt4Qt5/Qsci/qsciscintillabase.h 2019-10-22 09:07:55.429260135 +0200
@@ -31,6 +31,7 @@
#include <QByteArray>
#include <QPoint>
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/moodle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:

let
version = "3.7.2";
version = "3.7.3";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "1mvrmpqkcz7m7yplqi0lwgnal79n747f7nwcgd2nfrvz7jv3s8ir";
sha256 = "1n82n77lw83a5wjfjbvc74h2ny2z0zkdprxk7sai88rg6rix33ak";
};

phpConfig = writeText "config.php" ''