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

Commits on Nov 1, 2020

  1. musescore: 3.5.0 -> 3.5.2 

    Use fetchFromGitHub as it seems the only way to get the source now. Also
use libsForQt5 as it works.
    @doronbehar
    doronbehar committed Nov 1, 2020
    Copy the full SHA
    07cb335 View commit details

Commits on Nov 2, 2020

  1. Merge pull request #102380 from doronbehar/pkg/musescore

    @doronbehar
    doronbehar authored Nov 2, 2020
    Copy the full SHA
    3f84b2d View commit details
Showing with 8 additions and 7 deletions.
  1. +7 −6 pkgs/applications/audio/musescore/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
13 changes: 7 additions & 6 deletions pkgs/applications/audio/musescore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig
{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools
@@ -7,12 +7,13 @@

mkDerivation rec {
pname = "musescore";
version = "3.5.0";
version = "3.5.2";

src = fetchzip {
url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip";
sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9";
stripRoot = false;
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s=";
};

patches = [
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22378,7 +22378,7 @@ in
if stdenv.isDarwin then
callPackage ../applications/audio/musescore/darwin.nix { }
else
libsForQt514.callPackage ../applications/audio/musescore { };
libsForQt5.callPackage ../applications/audio/musescore { };

mmh = callPackage ../applications/networking/mailreaders/mmh { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };