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: a04feba65cd0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa06cb3782de
Choose a head ref
  • 15 commits
  • 13 files changed
  • 11 contributors

Commits on Oct 22, 2019

  1. elmPackages.{elm-test,elm-analyse}: elm 0.19.1 updates

    @turboMaCk
    turboMaCk committed Oct 22, 2019
    Copy the full SHA
    ff88fe0 View commit details

Commits on Oct 24, 2019

  1. s3backer: 1.5.2 -> 1.5.4 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/s3backer/versions
    @r-ryantm
    r-ryantm committed Oct 24, 2019
    Copy the full SHA
    3f8450e View commit details

  2. phpPackages.phpstan: 0.11.16 -> 0.11.19 

    Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.17
Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.18
Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.19
    @etu
    etu committed Oct 24, 2019
    Copy the full SHA
    e9de202 View commit details

  3. jormungandr: 0.7.0-alpha.dev.1 -> 0.7.0-rc1

    @mmahut
    mmahut committed Oct 24, 2019
    Copy the full SHA
    8d8ea13 View commit details

Commits on Oct 27, 2019

  1. riscv-pk-with-kernel: remove 

    hasn't evaluated sind Nov 2018, due to linux_riscv not existing since
then
    @globin
    globin committed Oct 27, 2019
    Copy the full SHA
    d06a481 View commit details

  2. pythonPackages.py3buddy: init at unstable-2019-09-29

    @prusnak
    prusnak committed Oct 27, 2019
    Copy the full SHA
    b3a629c View commit details

  3. Merge pull request #71465 from etu/phpstan-upgrade 

    phpPackages.phpstan: 0.11.16 -> 0.11.19
    @infinisil
    infinisil authored Oct 27, 2019
    Copy the full SHA
    ed14f35 View commit details

  4. Merge pull request #71693 from turboMaCk/elm-0.19.1-node-packages-upd… 

    …ates

elmPackages.{elm-test,elm-analyse}: elm 0.19.1 updates
    @domenkozar
    domenkozar authored Oct 27, 2019
    Copy the full SHA
    0b3ae79 View commit details

  5. tomahawk: Remove unmaintained broken package 

    Has been marked broken since 2018 and marked as abandoned upstream since
2017.
    @JohnAZoidberg
    JohnAZoidberg committed Oct 27, 2019
    Copy the full SHA
    417c853 View commit details

  6. taglib_1_9: Removed, not needed anymore 

    Was used by, the now removed, tomahawk.
    @JohnAZoidberg
    JohnAZoidberg committed Oct 27, 2019
    Copy the full SHA
    a3a782e View commit details

  7. Merge pull request #71901 from mmahut/jormungandr 

    jormungandr: 0.7.0-alpha.dev.1 -> 0.7.0-rc1
    @mmahut
    mmahut authored Oct 27, 2019
    Copy the full SHA
    ddf2305 View commit details

  8. Merge pull request #71883 from r-ryantm/auto-update/s3backer 

    s3backer: 1.5.2 -> 1.5.4
    @mmahut
    mmahut authored Oct 27, 2019
    Copy the full SHA
    4a7bb28 View commit details

  9. Merge pull request #72082 from JohnAZoidberg/remove-taglib_1_9 

     taglib_1_9, tomahawk:Remove unmaintained packages
    @flokli
    flokli authored Oct 27, 2019
    Copy the full SHA
    a2f50c0 View commit details

  10. verifpal: 0.2.0 → 0.7.5 (#72026)

    @jtojnar @ehmry
    jtojnar authored and ehmry committed Oct 27, 2019
    Copy the full SHA
    e59c610 View commit details

  11. Merge pull request #72078 from prusnak/py3buddy 

    pythonPackages.py3buddy: init at unstable-2019-09-29
    @mmahut
    mmahut authored Oct 27, 2019
    Copy the full SHA
    aa06cb3 View commit details
56 changes: 0 additions & 56 deletions pkgs/applications/audio/tomahawk/default.nix
View file

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/applications/blockchains/jormungandr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,16 +10,16 @@

rustPlatform.buildRustPackage rec {
pname = "jormungandr";
version = "0.7.0-alpha.dev.1";
version = "0.7.0-rc1";

src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
sha256 = "0r3icx42glrpa68sjxz4gr0z5660gh4n79lncy720s04cmgjcjci";
sha256 = "02ihnq7b32rwx7ychrj76rin1z3s9np5yjylppxm0qp5sjkik9ff";
fetchSubmodules = true;
};

cargoSha256 = "0f9b2lr2xxlcn9j33b5ahzbndz6sjm8ybhqm472bv5hzisqm4lg4";
cargoSha256 = "1pp829azj6aw68ba637rm852sj61nxznxfzrlqs9ds6adk9h7abs";

nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
4 changes: 1 addition & 3 deletions pkgs/development/compilers/elm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -78,9 +78,7 @@ let
elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples;
elm-language-server = nodePkgs."@elm-tooling/elm-language-server";

# elm-analyse@0.16.4 build is not working
elm-analyse = nodePkgs."elm-analyse-0.16.3";
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref;
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
};

patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; };
2 changes: 1 addition & 1 deletion pkgs/development/compilers/elm/packages/node-packages.json
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"elm-verify-examples",
"elm-doc-preview",
"elm-upgrade",
{ "elm-analyse": "0.16.3" },
"elm-analyse",
"elm-live",
"elm-xref",
"@elm-tooling/elm-language-server"
Loading