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: 8abca4bc7b8b
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: fef0aaaaab47
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 7, 2019

  1. pythonPackages.sqlalchemy_migrate: disable tests

    @veprbl
    veprbl authored Mar 7, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    31e932c View commit details

  2. vscode: 1.31.1 -> 1.32.0 

    (cherry picked from commit 2a0d01f)
    @eadwu @worldofpeace
    eadwu authored and worldofpeace committed Mar 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fef0aaa View commit details
Showing with 6 additions and 7 deletions.
  1. +4 −4 pkgs/applications/editors/vscode/default.nix
  2. +2 −3 pkgs/development/python-modules/sqlalchemy-migrate/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/editors/vscode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,16 +16,16 @@ let
}.${system};

sha256 = {
"i686-linux" = "04kbx1cx40lsy9irxy1arp1rixzk49ldhg34w3llmfbx63a4hchf";
"x86_64-linux" = "1plvx0mjcbizl6iffib95p5224r9frf0mn6c5xp14p3qnrp32jhm";
"x86_64-darwin" = "14h9gs6jpxydgd1h16ybq3ifw5jc7k83yg22pw3sk6vhy7hx7pxr";
"i686-linux" = "09hm0qm0hajfqn5mn9m60kgs7gkbk2vx6x5llvndfncazi0s1pjn";
"x86_64-linux" = "0zb71ca2v1a4hgh7dfm2ad558ipw5pgj8pvxb2k9n0454g2nn14k";
"x86_64-darwin" = "0kqcfa9rymzgk4ixl2xj67kk4rij3f4vim86wqj1d1m2fja8n8kx";
}.${system};

archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
in
stdenv.mkDerivation rec {
name = "vscode-${version}";
version = "1.31.1";
version = "1.32.0";

src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/sqlalchemy-migrate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,14 +32,13 @@ buildPythonPackage rec {
${python.interpreter} setup.py test
'';

doCheck = true;
# Tests fail on hydra sometimes
doCheck = false;

meta = with stdenv.lib; {
homepage = http://code.google.com/p/sqlalchemy-migrate/;
description = "Schema migration tools for SQLAlchemy";
license = licenses.asl20;
maintainers = with maintainers; [ makefu ];
};

_hydra_please_try_again = 1;
}