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: d5fb62c9387f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0ce30d9f7ba
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Dec 18, 2020

  1. Revert "cinnamon.cinnamon-session: 4.6.2 -> 4.8.0" 

    This reverts commit 54eed8a.
    @mkg20001
    mkg20001 committed Dec 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a1bb7ef View commit details

  2. Revert "cinnamon.cinnamon-menus: 4.6.1 -> 4.8.1" 

    This reverts commit 14cd498.
    @mkg20001
    mkg20001 committed Dec 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    22c23fd View commit details

  3. Revert "cinnamon.cinnamon-desktop: 4.6.4 -> 4.8.0" 

    This reverts commit 50b6c20.
    @mkg20001
    mkg20001 committed Dec 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    19894af View commit details

  4. Revert "cinnamon.cinnamon-translations: 4.6.2 -> 4.8.0" 

    This reverts commit b02dbec.
    @mkg20001
    mkg20001 committed Dec 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ef474f9 View commit details

  5. codeowners: add mkg20001 to cinnamon

    @mkg20001
    mkg20001 committed Dec 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ae24ec3 View commit details

Commits on Jan 5, 2021

  1. Merge pull request #107135 from mkg20001/cinnamon-fixup 

    Cinnamon Fixup
    @worldofpeace
    worldofpeace authored Jan 5, 2021

    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
    d0ce30d View commit details
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
@@ -220,3 +220,6 @@
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq

# Cinnamon
/pkgs/desktops/cinnamon @mkg20001
4 changes: 2 additions & 2 deletions pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@

stdenv.mkDerivation rec {
pname = "cinnamon-desktop";
version = "4.8.0";
version = "4.6.4";

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1369iig7w0x45sr9yd4a5xxqrwsfwq90hlnknarhz62h5hpykjwi";
sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd";
};

outputs = [ "out" "dev" ];
4 changes: 2 additions & 2 deletions pkgs/desktops/cinnamon/cinnamon-menus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
pname = "cinnamon-menus";
version = "4.8.1";
version = "4.6.1";

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1fsiq8q8b65skxbg1bsishygnw2zg8kr0d09rassqjdimd4yfi1y";
sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/cinnamon/cinnamon-session/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,13 +27,13 @@

stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "4.8.0";
version = "4.6.2";

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0sbfd1d4kjiccaq9s36r2cvdcmvd1x2087nkfgl32gwxakqi3g4n";
sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/desktops/cinnamon/cinnamon-translations/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "cinnamon-translations";
version = "4.8.0";
version = "4.6.2";

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1j3azjwin89z5v6nphx0wsa35p224h2gps50kcq9gwankkfcf3q1";
sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6";
};

nativeBuildInputs = [