Merge staging-next into staging
This commit is contained in:
commit
18cf872af0
|
@ -4604,6 +4604,12 @@
|
|||
githubId = 54799;
|
||||
name = "Edward Tjörnhammar";
|
||||
};
|
||||
ee2500 = {
|
||||
email = "earthengine@skiff.com";
|
||||
github = "ee2500";
|
||||
githubId = 134107129;
|
||||
name = "EarthEngine";
|
||||
};
|
||||
eelco = {
|
||||
email = "edolstra+nixpkgs@gmail.com";
|
||||
github = "edolstra";
|
||||
|
|
|
@ -95,6 +95,8 @@ in {
|
|||
${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)}
|
||||
'' + optionalString (def.macvlan != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)}
|
||||
'' + optionalString (def.macvtap != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "MACVTAP=${s}") def.macvtap)}
|
||||
'' + optionalString (def.vxlan != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)}
|
||||
'' + optionalString (def.tunnel != [ ]) ''
|
||||
|
|
|
@ -2629,238 +2629,6 @@ let
|
|||
${attrsToSection def.dhcpV6Config}
|
||||
''; };
|
||||
|
||||
networkToUnit = name: def:
|
||||
{ inherit (def) enable;
|
||||
text = commonMatchText def
|
||||
+ optionalString (def.linkConfig != { }) ''
|
||||
[Link]
|
||||
${attrsToSection def.linkConfig}
|
||||
''
|
||||
+ ''
|
||||
[Network]
|
||||
''
|
||||
+ attrsToSection def.networkConfig
|
||||
+ optionalString (def.address != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "Address=${s}") def.address)}
|
||||
''
|
||||
+ optionalString (def.gateway != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)}
|
||||
''
|
||||
+ optionalString (def.dns != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)}
|
||||
''
|
||||
+ optionalString (def.ntp != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)}
|
||||
''
|
||||
+ optionalString (def.bridge != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "Bridge=${s}") def.bridge)}
|
||||
''
|
||||
+ optionalString (def.bond != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "Bond=${s}") def.bond)}
|
||||
''
|
||||
+ optionalString (def.vrf != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "VRF=${s}") def.vrf)}
|
||||
''
|
||||
+ optionalString (def.vlan != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)}
|
||||
''
|
||||
+ optionalString (def.macvlan != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)}
|
||||
''
|
||||
+ optionalString (def.macvtap != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "MACVTAP=${s}") def.macvtap)}
|
||||
''
|
||||
+ optionalString (def.vxlan != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)}
|
||||
''
|
||||
+ optionalString (def.tunnel != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)}
|
||||
''
|
||||
+ optionalString (def.xfrm != [ ]) ''
|
||||
${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)}
|
||||
''
|
||||
+ ''
|
||||
|
||||
''
|
||||
+ flip concatMapStrings def.addresses (x: ''
|
||||
[Address]
|
||||
${attrsToSection x.addressConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.routingPolicyRules (x: ''
|
||||
[RoutingPolicyRule]
|
||||
${attrsToSection x.routingPolicyRuleConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.routes (x: ''
|
||||
[Route]
|
||||
${attrsToSection x.routeConfig}
|
||||
'')
|
||||
+ optionalString (def.dhcpV4Config != { }) ''
|
||||
[DHCPv4]
|
||||
${attrsToSection def.dhcpV4Config}
|
||||
''
|
||||
+ optionalString (def.dhcpV6Config != { }) ''
|
||||
[DHCPv6]
|
||||
${attrsToSection def.dhcpV6Config}
|
||||
''
|
||||
+ optionalString (def.dhcpPrefixDelegationConfig != { }) ''
|
||||
[DHCPPrefixDelegation]
|
||||
${attrsToSection def.dhcpPrefixDelegationConfig}
|
||||
''
|
||||
+ optionalString (def.ipv6AcceptRAConfig != { }) ''
|
||||
[IPv6AcceptRA]
|
||||
${attrsToSection def.ipv6AcceptRAConfig}
|
||||
''
|
||||
+ optionalString (def.dhcpServerConfig != { }) ''
|
||||
[DHCPServer]
|
||||
${attrsToSection def.dhcpServerConfig}
|
||||
''
|
||||
+ optionalString (def.ipv6SendRAConfig != { }) ''
|
||||
[IPv6SendRA]
|
||||
${attrsToSection def.ipv6SendRAConfig}
|
||||
''
|
||||
+ flip concatMapStrings def.ipv6Prefixes (x: ''
|
||||
[IPv6Prefix]
|
||||
${attrsToSection x.ipv6PrefixConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.ipv6RoutePrefixes (x: ''
|
||||
[IPv6RoutePrefix]
|
||||
${attrsToSection x.ipv6RoutePrefixConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.dhcpServerStaticLeases (x: ''
|
||||
[DHCPServerStaticLease]
|
||||
${attrsToSection x.dhcpServerStaticLeaseConfig}
|
||||
'')
|
||||
+ optionalString (def.bridgeConfig != { }) ''
|
||||
[Bridge]
|
||||
${attrsToSection def.bridgeConfig}
|
||||
''
|
||||
+ flip concatMapStrings def.bridgeFDBs (x: ''
|
||||
[BridgeFDB]
|
||||
${attrsToSection x.bridgeFDBConfig}
|
||||
'')
|
||||
+ flip concatMapStrings def.bridgeMDBs (x: ''
|
||||
[BridgeMDB]
|
||||
${attrsToSection x.bridgeMDBConfig}
|
||||
'')
|
||||
+ optionalString (def.lldpConfig != { }) ''
|
||||
[LLDP]
|
||||
${attrsToSection def.lldpConfig}
|
||||
''
|
||||
+ optionalString (def.canConfig != { }) ''
|
||||
[CAN]
|
||||
${attrsToSection def.canConfig}
|
||||
''
|
||||
+ optionalString (def.ipoIBConfig != { }) ''
|
||||
[IPoIB]
|
||||
${attrsToSection def.ipoIBConfig}
|
||||
''
|
||||
+ optionalString (def.qdiscConfig != { }) ''
|
||||
[QDisc]
|
||||
${attrsToSection def.qdiscConfig}
|
||||
''
|
||||
+ optionalString (def.networkEmulatorConfig != { }) ''
|
||||
[NetworkEmulator]
|
||||
${attrsToSection def.networkEmulatorConfig}
|
||||
''
|
||||
+ optionalString (def.tokenBucketFilterConfig != { }) ''
|
||||
[TokenBucketFilter]
|
||||
${attrsToSection def.tokenBucketFilterConfig}
|
||||
''
|
||||
+ optionalString (def.pieConfig != { }) ''
|
||||
[PIE]
|
||||
${attrsToSection def.pieConfig}
|
||||
''
|
||||
+ optionalString (def.flowQueuePIEConfig != { }) ''
|
||||
[FlowQueuePIE]
|
||||
${attrsToSection def.flowQueuePIEConfig}
|
||||
''
|
||||
+ optionalString (def.stochasticFairBlueConfig != { }) ''
|
||||
[StochasticFairBlue]
|
||||
${attrsToSection def.stochasticFairBlueConfig}
|
||||
''
|
||||
+ optionalString (def.stochasticFairnessQueueingConfig != { }) ''
|
||||
[StochasticFairnessQueueing]
|
||||
${attrsToSection def.stochasticFairnessQueueingConfig}
|
||||
''
|
||||
+ optionalString (def.bfifoConfig != { }) ''
|
||||
[BFIFO]
|
||||
${attrsToSection def.bfifoConfig}
|
||||
''
|
||||
+ optionalString (def.pfifoConfig != { }) ''
|
||||
[PFIFO]
|
||||
${attrsToSection def.pfifoConfig}
|
||||
''
|
||||
+ optionalString (def.pfifoHeadDropConfig != { }) ''
|
||||
[PFIFOHeadDrop]
|
||||
${attrsToSection def.pfifoHeadDropConfig}
|
||||
''
|
||||
+ optionalString (def.pfifoFastConfig != { }) ''
|
||||
[PFIFOFast]
|
||||
${attrsToSection def.pfifoFastConfig}
|
||||
''
|
||||
+ optionalString (def.cakeConfig != { }) ''
|
||||
[CAKE]
|
||||
${attrsToSection def.cakeConfig}
|
||||
''
|
||||
+ optionalString (def.controlledDelayConfig != { }) ''
|
||||
[ControlledDelay]
|
||||
${attrsToSection def.controlledDelayConfig}
|
||||
''
|
||||
+ optionalString (def.deficitRoundRobinSchedulerConfig != { }) ''
|
||||
[DeficitRoundRobinScheduler]
|
||||
${attrsToSection def.deficitRoundRobinSchedulerConfig}
|
||||
''
|
||||
+ optionalString (def.deficitRoundRobinSchedulerClassConfig != { }) ''
|
||||
[DeficitRoundRobinSchedulerClass]
|
||||
${attrsToSection def.deficitRoundRobinSchedulerClassConfig}
|
||||
''
|
||||
+ optionalString (def.enhancedTransmissionSelectionConfig != { }) ''
|
||||
[EnhancedTransmissionSelection]
|
||||
${attrsToSection def.enhancedTransmissionSelectionConfig}
|
||||
''
|
||||
+ optionalString (def.genericRandomEarlyDetectionConfig != { }) ''
|
||||
[GenericRandomEarlyDetection]
|
||||
${attrsToSection def.genericRandomEarlyDetectionConfig}
|
||||
''
|
||||
+ optionalString (def.fairQueueingControlledDelayConfig != { }) ''
|
||||
[FairQueueingControlledDelay]
|
||||
${attrsToSection def.fairQueueingControlledDelayConfig}
|
||||
''
|
||||
+ optionalString (def.fairQueueingConfig != { }) ''
|
||||
[FairQueueing]
|
||||
${attrsToSection def.fairQueueingConfig}
|
||||
''
|
||||
+ optionalString (def.trivialLinkEqualizerConfig != { }) ''
|
||||
[TrivialLinkEqualizer]
|
||||
${attrsToSection def.trivialLinkEqualizerConfig}
|
||||
''
|
||||
+ optionalString (def.hierarchyTokenBucketConfig != { }) ''
|
||||
[HierarchyTokenBucket]
|
||||
${attrsToSection def.hierarchyTokenBucketConfig}
|
||||
''
|
||||
+ optionalString (def.hierarchyTokenBucketClassConfig != { }) ''
|
||||
[HierarchyTokenBucketClass]
|
||||
${attrsToSection def.hierarchyTokenBucketClassConfig}
|
||||
''
|
||||
+ optionalString (def.heavyHitterFilterConfig != { }) ''
|
||||
[HeavyHitterFilter]
|
||||
${attrsToSection def.heavyHitterFilterConfig}
|
||||
''
|
||||
+ optionalString (def.quickFairQueueingConfig != { }) ''
|
||||
[QuickFairQueueing]
|
||||
${attrsToSection def.quickFairQueueingConfig}
|
||||
''
|
||||
+ optionalString (def.quickFairQueueingConfigClass != { }) ''
|
||||
[QuickFairQueueingClass]
|
||||
${attrsToSection def.quickFairQueueingConfigClass}
|
||||
''
|
||||
+ flip concatMapStrings def.bridgeVLANs (x: ''
|
||||
[BridgeVLAN]
|
||||
${attrsToSection x.bridgeVLANConfig}
|
||||
'')
|
||||
+ def.extraConfig;
|
||||
};
|
||||
|
||||
mkUnitFiles = prefix: cfg: listToAttrs (map (name: {
|
||||
name = "${prefix}systemd/network/${name}";
|
||||
value.source = "${cfg.units.${name}.unit}/${name}";
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightdm-slick-greeter";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "slick-greeter";
|
||||
rev = version;
|
||||
sha256 = "sha256-40RyGWn32ppPjsuPljGBO6o7bu2rKYBweDycRS7xAVA=";
|
||||
sha256 = "sha256-OSL4Ls3bCua5ut8zWodeIH1SfevCbsS7BgBJYdcJaVE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xed-editor";
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "xed";
|
||||
rev = version;
|
||||
sha256 = "sha256-fTrvHf7iA3qexxdebSgzLXlngAOkdraW3KiVTVYodrY=";
|
||||
sha256 = "sha256-nc8YS1PcmtM37TJpGl691SlxJliyI2gSGJtNzkWbk9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
508
pkgs/applications/graphics/rnote/Cargo.lock
generated
508
pkgs/applications/graphics/rnote/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -25,20 +25,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnote";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PkC2w14xM+5ai/RuF0rCUpUCxX3hFNB+fq2RkebPKGQ=";
|
||||
hash = "sha256-QcgmL6lLi/3QXnlcEsVyTqNUfjSm+R+nhRzRvw8M9Qc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ink-stroke-modeler-rs-0.1.0" = "sha256-1abfrPehOGc/ye/iFIwYPd6HJX6P8OP2vGBSJfeo+c8=";
|
||||
"librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w=";
|
||||
"librsvg-2.56.2" = "sha256-uCHKDC4nc7J0k9qsmzF6etkWOoNq51Dddd9uQw5DOT0=";
|
||||
"piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU=";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sticky";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM=";
|
||||
hash = "sha256-Am62Azm27irIUQEpZVY8ZP2pslH1eaiyRBdq4eSakQA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.14.8";
|
||||
version = "0.14.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s8wIk6M0vSRxbDLGmSZpRWEpCMcCMxyizzTpa/VsC1A=";
|
||||
hash = "sha256-4T8h4KPouhjGaeeThCULilzmPs2CVGBpiqXYmtSkCO4=";
|
||||
};
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
vendorHash = "sha256-SMizkmskNFqnyI6bZYViFqGP7GLZbWoKCbeEzRjO9VQ=";
|
||||
vendorHash = "sha256-a+hcd0vQ0jt3Dp+YnMORe6yIohbmpN22sOUJ6G1i4P4=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Exclude broken impala & hive driver
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.27";
|
||||
ptb = "0.0.43";
|
||||
ptb = "0.0.44";
|
||||
canary = "0.0.162";
|
||||
development = "0.0.217";
|
||||
} else {
|
||||
|
@ -20,7 +20,7 @@ let
|
|||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
sha256 = "tG+QR62JcBYrvJS6KU6oAWSfQFdl68AMcU8E9Zahy2A=";
|
||||
sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
rev = version;
|
||||
hash = "sha256-Oxv70bFheKhlYyLdGcn0Hja+LAmn6RHfAh5FIjghD9o=";
|
||||
hash = "sha256-qw22izmh0bQ1B1kRqkMcmEdqU665/DtLod24TUH86Ww=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-move-transition";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-move-transition";
|
||||
rev = version;
|
||||
sha256 = "sha256-RwWd5O1PW93mGZRmopZn8HAVNb7cSUvnSPslRSXPzrM=";
|
||||
sha256 = "sha256-8c+ifFESdNgND+93pOCwkNSvvPtzvNPtvQIp8oW6CQE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bulky";
|
||||
version = "2.9";
|
||||
version = "2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "bulky";
|
||||
rev = version;
|
||||
hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4=";
|
||||
hash = "sha256-3hpg9a5HU7mSSlMOWvmB/p0Mlyla5PDiS0J9iYJLr6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -72,13 +72,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-common";
|
||||
version = "5.8.3";
|
||||
version = "5.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
rev = version;
|
||||
hash = "sha256-PvU5lcoIDguWiLdI+uIiJHqS1ae436Xc7TfRVytR02k=";
|
||||
hash = "sha256-34kOSDIU56cSZ4j0FadVfr9HLQytnK4ys88DFF7LTiM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-control-center";
|
||||
version = "5.8.1";
|
||||
version = "5.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-tRLUdwEptLNngVq+qOPilGQipVXNeDlzohgu3VlVciI=";
|
||||
hash = "sha256-7AXm4ZTpI/4Xa2lwDmEvomNdwmgVoXSKqojpFZMuoVQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-screensaver";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Y1veBgWTCs7HRBuMwN+eHu4oygGYIanaQigMGVfkSuI=";
|
||||
hash = "sha256-d7h9OJ39HVQNCHNr13M1ybDFoU3Xnd1PEczGLHZU/lU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "folder-color-switcher";
|
||||
version = "1.5.8";
|
||||
version = "1.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
# They don't really do tags, this is just a named commit.
|
||||
rev = "f167627cffaf8b34e27b0515153b669b980fd62e";
|
||||
sha256 = "sha256-u8Lv0OTxKgjIp1q5WR0NXULhnwFfEDYGRlBpFMVHCBY=";
|
||||
rev = "b735ed90b798eda541885735368930d045430e6e";
|
||||
sha256 = "sha256-acbBghi3LWpGH1dBF8icuTGgliA+NM+pE8YDN3WxOic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,14 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mint-l-theme";
|
||||
version = "1.9.4";
|
||||
version = "1.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-uVWqsGdwFj4zLP5CqBCci+qbX9l+/esvoFWlToJR8lE=";
|
||||
# They don't really do tags, this is just a named commit.
|
||||
rev = "078219f4f947245b3b7bf271c7311f67bf744bfb";
|
||||
hash = "sha256-GK1bwKeyYTXZUNnOdOnqu2C0ZwJHheRVRYL2SLwOnd0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mint-themes";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Tr9MtEsd5+8YGsJvBF+i39dBL6/ufC3UVhgi8pP04Zs=";
|
||||
hash = "sha256-l/ePlvdrHUhRz/KBaBgUSA9KF/pufqeCgSAFRR03IKE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "muffin";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2pF6mKSSW4S0mfb4iBfZKBIVXKzrVyPeftcVrWSWzhc=";
|
||||
hash = "sha256-9YE+pHXJb21CcAflL9swNyhQY3ZCkLlZbnmUwTNdyfA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo";
|
||||
version = "5.8.3";
|
||||
version = "5.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/GwtTklOkhCkbBMQLl4dKUnlZwN6FX2kqxN7cJVaVwE=";
|
||||
sha256 = "sha256-WjgQXQe8iCzkc4pmeTIx6mSlsg88xy3FTPMokJWo3fg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pix";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sKmdJOuT4Ioy5DmWN9ly+9bqSn4frcVPD5qMTKtxtiQ=";
|
||||
sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xreader";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZmaY9FlDIJNQ9jYkUJDnKAgwn5wlQY89eWx3/RJZA7E=";
|
||||
sha256 = "sha256-2zqlfoN4L+V237cQ3PVh49YaZfNKGiLqh2JIiGJE340=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,20 +8,19 @@
|
|||
, cinnamon
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, mate
|
||||
, xdg-desktop-portal
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-xapp";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "xdg-desktop-portal-xapp";
|
||||
rev = version;
|
||||
hash = "sha256-0qZUSo3m63kSFYbfn8GUU8JLdgBimlqfEWWrsK/k+Aw=";
|
||||
hash = "sha256-sPpRDoQuzyjqB+kwz0U2WFm/Byx7SueM3aCtpgy38JM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
cinnamon.cinnamon-desktop # org.cinnamon.desktop.background
|
||||
glib
|
||||
gsettings-desktop-schemas # org.gnome.system.location
|
||||
gtk3
|
||||
mate.mate-desktop # org.mate.background
|
||||
xdg-desktop-portal
|
||||
];
|
||||
|
|
28
pkgs/development/libraries/yas/default.nix
Normal file
28
pkgs/development/libraries/yas/default.nix
Normal file
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "yas";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niXman";
|
||||
repo = "yas";
|
||||
rev = version;
|
||||
hash = "sha256-2+CpftWOEnntYBCc1IoR5eySbmhrMVunpUTZRdQ5I+A=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/include/yas
|
||||
cp -r include/yas/* $out/include/yas
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/niXman/yas";
|
||||
description = "Yet Another Serialization";
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ ee2500 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
70
pkgs/development/python-modules/canals/default.nix
Normal file
70
pkgs/development/python-modules/canals/default.nix
Normal file
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, fetchFromGitHub
|
||||
# native build inputs
|
||||
, hatchling
|
||||
# build input
|
||||
, networkx
|
||||
# check inputs
|
||||
, pytestCheckHook
|
||||
# optional dependencies
|
||||
, pygraphviz
|
||||
, requests
|
||||
, mkdocs-material
|
||||
, mkdocs-mermaid2-plugin
|
||||
, mkdocstrings
|
||||
}:
|
||||
let
|
||||
pname = "canals";
|
||||
version = "0.2.2";
|
||||
optional-dependencies = {
|
||||
graphviz = [ pygraphviz ];
|
||||
mermaid = [ requests ];
|
||||
docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ];
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version pname;
|
||||
format = "pyproject";
|
||||
|
||||
# Pypi source package doesn't contain tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepset-ai";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
networkx
|
||||
];
|
||||
|
||||
passthru = { inherit optional-dependencies; };
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
] ++ optional-dependencies.mermaid;
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires internet connection to mermaid.ink
|
||||
"test/pipelines/integration"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "canals" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A component orchestration engine";
|
||||
homepage = "https://github.com/deepset-ai/canals";
|
||||
changelog = "https://github.com/deepset-ai/canals/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
43
pkgs/development/python-modules/effdet/default.nix
Normal file
43
pkgs/development/python-modules/effdet/default.nix
Normal file
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
# build inputs
|
||||
, torch
|
||||
, torchvision
|
||||
, timm
|
||||
, pycocotools
|
||||
, omegaconf
|
||||
}:
|
||||
let
|
||||
pname = "effdet";
|
||||
version = "0.4.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rFWJ/TBKVlDCAZhrLvX44QwREJOnGxxJ+muIF3EIErU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
torch
|
||||
torchvision
|
||||
timm
|
||||
pycocotools
|
||||
omegaconf
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "effdet" ];
|
||||
|
||||
meta = {
|
||||
description = "A PyTorch implementation of EfficientDet";
|
||||
homepage = "https://pypi.org/project/effdet";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.13.3";
|
||||
version = "2.13.5";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "sha256-CYc/tFjDFXFlSY4/ykM7OR8HsUbYQUHL5IfGYw7to4k=";
|
||||
sha256 = "sha256-/carrJ87XvnD5Pd+MJAqNdXxA5vyJl0mX1hEbykhSUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.34";
|
||||
version = "0.0.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-arrhKskf3McXx8er6AyUIT1ZM3Rzwo10qTswpF+1klw=";
|
||||
hash = "sha256-MzcGWOJud8SA6cpTdhms+Hfi0sAqelOr7dgy/k1H+qw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-m9/cIdmDqoUCeZnP7YezgCB/i8UGTcCCWDD/Qwhzg9E=";
|
||||
cargoHash = "sha256-Xl0YxBmhhFKBzxbO1GXIds3XdSS78/7Z1rOAmLgTYSw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "17.5.2";
|
||||
version = "17.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WNB4NzOvabShVHivDs027y6QmU71GMrYJehCB9jPlA8=";
|
||||
hash = "sha256-mWHoiFal9WdASMe/Q7EJBp1Z2xu7Wq0i06xyqmi8q24=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fHwaCcN47+LkJYqRFSQgVddVuR1QfdFuSNDYFh1edM4=";
|
||||
|
@ -26,7 +26,8 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X github.com/jandedobbeleer/oh-my-posh/src/build.Version=${version}"
|
||||
"-X github.com/jandedobbeleer/oh-my-posh/src/build.Date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
tags = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skaffold";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "skaffold";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ncUA3sN8rWIf4tb3RAuUJWkOlxMMj/FrtSXy0sPfwGM=";
|
||||
hash = "sha256-IgTAUxA1Cfe0LaYKrKtbm1PELGic31XRdGMIoLDG6w0=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "maptool";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
repoBase = "https://github.com/RPTools/${pname}";
|
||||
src = fetchurl {
|
||||
url = "${repoBase}/releases/download/${version}/MapTool-${version}.jar";
|
||||
hash = "sha256-EHisFvLaqi8VqIdygf0nxohKLL3c/yE5Y6jAcT0B2q0=";
|
||||
hash = "sha256-14ULI1OAk0V4DqiL5IF7DK6pw0NRfmU+omrFP72PblA=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
@ -7,9 +7,6 @@
|
|||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "sound-of-sorting";
|
||||
version = "unstable-2022-10-12";
|
||||
|
@ -18,17 +15,24 @@ stdenv.mkDerivation {
|
|||
owner = "bingmann";
|
||||
repo = "sound-of-sorting";
|
||||
rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b";
|
||||
sha256 = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8=";
|
||||
hash = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ wxGTK32 SDL2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
buildInputs = [
|
||||
wxGTK32
|
||||
SDL2
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Audibilization and Visualization of Sorting Algorithms";
|
||||
homepage = "https://panthema.net/2013/sound-of-sorting/";
|
||||
license = with licenses; gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.11.9";
|
||||
version = "0.11.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OS/yEr3/HQTPCfonQABvHW+c5wSzhi8JbrMbfwuyd/s=";
|
||||
sha256 = "sha256-1jJDgjkay1IsWMWoRf6iRWFr7685uE9Kr9DCreH13CM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j/ZsnvcGREmFpO7IJfPVmSFkKSIJW+bAMqAGNj8vopk=";
|
||||
vendorHash = "sha256-rHUPtscmG28PyNWzoayThbRt+3t9ewBe8vsRqtVc1WM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.34.2";
|
||||
version = "2.34.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rq+TN9j/PX2h3lzK+WhcB3KBgvcTyXyU9VApelqfIJE=";
|
||||
hash = "sha256-Cy2mRcx8UZp9+7O824sosQ8ld9ppl2YvCssvL16aBsA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UyWrvReFUCQ091Mbk1iJE55rJkkmTyMX4yvb9ppszt8=";
|
||||
vendorHash = "sha256-Z812v+UTaAi3tA2hWtZkQXrtlXhQzlawYtbQdX1HHN0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Yc2vtdt+kXTQdXuOS83pODUjBvt8yP8rX1XCbdSKbPc=";
|
||||
sha256 = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib libxcrypt ]
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -9,37 +10,55 @@ let
|
|||
poetry = self.callPackage ./unwrapped.nix { };
|
||||
|
||||
# version overrides required by poetry and its plugins
|
||||
platformdirs = super.platformdirs.overridePythonAttrs (old: rec {
|
||||
version = "2.6.2";
|
||||
cachecontrol = super.cachecontrol.overridePythonAttrs (old: rec {
|
||||
version = "0.12.14";
|
||||
format = "setuptools";
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformdirs";
|
||||
repo = "platformdirs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME=";
|
||||
owner = "ionrock";
|
||||
repo = "cachecontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BuBaKP7OAYoT+SPVhtE6l9U/KmN21OKTL6poV5a6+0c=";
|
||||
};
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
nativeCheckInputs = old.nativeCheckInputs ++ [
|
||||
self.lockfile
|
||||
];
|
||||
});
|
||||
poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
|
||||
version = "1.5.2";
|
||||
version = "1.6.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = "poetry-core";
|
||||
rev = version;
|
||||
hash = "sha256-GpZ0vMByHTu5kl7KrrFFK2aZMmkNO7xOEc8NI2H9k34=";
|
||||
hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74=";
|
||||
};
|
||||
nativeCheckInputs = old.nativeCheckInputs ++ [
|
||||
self.tomli-w
|
||||
];
|
||||
});
|
||||
};
|
||||
virtualenv = super.virtualenv.overridePythonAttrs (old: rec {
|
||||
version = "20.23.1";
|
||||
src = fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
hash = "sha256-j/GaOMECHHQhSO3E+By0PX+MaBbS7eKrcq9bhMdJreE=";
|
||||
};
|
||||
nativeCheckInputs = old.nativeCheckInputs ++ [
|
||||
self.time-machine
|
||||
];
|
||||
});
|
||||
} // (plugins self);
|
||||
};
|
||||
|
||||
plugins = with python.pkgs; {
|
||||
plugins = ps: with ps; {
|
||||
poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { };
|
||||
poetry-plugin-export = callPackage ./plugins/poetry-plugin-export.nix { };
|
||||
poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { };
|
||||
};
|
||||
|
||||
# selector is a function mapping pythonPackages to a list of plugins
|
||||
# e.g. poetry.withPlugins (ps: with ps; [ poetry-plugin-up ])
|
||||
withPlugins = selector: let
|
||||
selected = selector plugins;
|
||||
selected = selector (plugins python.pkgs);
|
||||
in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs = old.propagatedBuildInputs ++ selected;
|
||||
|
||||
|
@ -52,8 +71,9 @@ let
|
|||
rm $out/nix-support/propagated-build-inputs
|
||||
'';
|
||||
|
||||
passthru = rec {
|
||||
inherit plugins withPlugins python;
|
||||
passthru = {
|
||||
plugins = plugins python.pkgs;
|
||||
inherit withPlugins python;
|
||||
};
|
||||
}));
|
||||
in withPlugins (ps: [ ])
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry-plugin-export";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zA5YHZ3/iVoNf2AKqkrKVDYJIoJh+FMwuoskWHutG5I=";
|
||||
hash = "sha256-okI91Z9u5w7IHpPb9jL4Hb8+MkYJEF2qm0mqqCdyKbk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
|
@ -19,6 +20,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-QDfXgLkwh5rfyNZv0S7+cq6ubldXsbuCiTr6VYx8ZQs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/MousaZeidBaker/poetry-plugin-up/pull/24
|
||||
(fetchpatch {
|
||||
url = "https://github.com/MousaZeidBaker/poetry-plugin-up/commit/31d78c547896efd27c2be0956a982638f32b07f8.patch";
|
||||
hash = "sha256-CkZgX/ES+VkfxBofxWeparXNjsdP4qcQ1I32zaBBmWo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "poetry";
|
||||
version = "1.4.2";
|
||||
version = "1.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
|||
owner = "python-poetry";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AiRQFZA5+M1niTzj1RO2lx0QFOMmSzpQo1gzauyTblg=";
|
||||
hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -123,6 +123,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_installer_with_pypi_repository"
|
||||
# touches network
|
||||
"git"
|
||||
"solver"
|
||||
|
|
|
@ -2,11 +2,11 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
Ascii85 (1.1.0)
|
||||
addressable (2.8.1)
|
||||
addressable (2.8.4)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
afm (0.2.2)
|
||||
asciidoctor (2.0.18)
|
||||
asciidoctor-pdf (2.3.2)
|
||||
asciidoctor (2.0.20)
|
||||
asciidoctor-pdf (2.3.9)
|
||||
asciidoctor (~> 2.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
matrix (~> 0.4)
|
||||
|
@ -17,13 +17,13 @@ GEM
|
|||
prawn-templates (~> 0.1.0)
|
||||
treetop (~> 1.6.0)
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.1.10)
|
||||
css_parser (1.12.0)
|
||||
concurrent-ruby (1.2.2)
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
hashery (2.1.2)
|
||||
matrix (0.4.2)
|
||||
pdf-core (0.9.0)
|
||||
pdf-reader (2.10.0)
|
||||
pdf-reader (2.11.0)
|
||||
Ascii85 (~> 1.0)
|
||||
afm (~> 0.2.1)
|
||||
hashery (~> 2.0)
|
||||
|
@ -44,14 +44,13 @@ GEM
|
|||
prawn-templates (0.1.2)
|
||||
pdf-reader (~> 2.0)
|
||||
prawn (~> 2.2)
|
||||
public_suffix (5.0.0)
|
||||
pygments.rb (2.3.0)
|
||||
public_suffix (5.0.1)
|
||||
pygments.rb (2.4.0)
|
||||
rexml (3.2.5)
|
||||
rouge (4.0.0)
|
||||
rouge (4.1.2)
|
||||
ruby-rc4 (0.1.5)
|
||||
temple (0.10.2)
|
||||
thor (1.2.2)
|
||||
treetop (1.6.11)
|
||||
tilt (2.2.0)
|
||||
treetop (1.6.12)
|
||||
polyglot (~> 0.3)
|
||||
ttfunk (1.7.0)
|
||||
|
||||
|
@ -64,6 +63,7 @@ DEPENDENCIES
|
|||
coderay
|
||||
pygments.rb
|
||||
rouge
|
||||
tilt
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.13
|
||||
2.4.14
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.4";
|
||||
};
|
||||
afm = {
|
||||
groups = ["default"];
|
||||
|
@ -35,10 +35,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv";
|
||||
sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.18";
|
||||
version = "2.0.20";
|
||||
};
|
||||
asciidoctor-pdf = {
|
||||
dependencies = ["asciidoctor" "concurrent-ruby" "matrix" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "treetop"];
|
||||
|
@ -46,10 +46,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16mw0mlrrx44wn5j2knp3cv7b7phan90y4dr285c1qgdd25310xv";
|
||||
sha256 = "19c98a6riqhxxlc7kmksjslnyxdjp106ppsqy1vdbkjb39zfign3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.2";
|
||||
version = "2.3.9";
|
||||
};
|
||||
coderay = {
|
||||
groups = ["default"];
|
||||
|
@ -66,10 +66,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.10";
|
||||
version = "1.2.2";
|
||||
};
|
||||
css_parser = {
|
||||
dependencies = ["addressable"];
|
||||
|
@ -77,10 +77,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b";
|
||||
sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "1.14.0";
|
||||
};
|
||||
hashery = {
|
||||
groups = ["default"];
|
||||
|
@ -118,10 +118,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07chhyxf3qlr65jngns3z5187ibfibf5h2q59505vx45dfr3lvwz";
|
||||
sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
};
|
||||
polyglot = {
|
||||
groups = ["default"];
|
||||
|
@ -193,20 +193,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
|
||||
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
};
|
||||
"pygments.rb" = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac";
|
||||
sha256 = "080kb51l3m0n7xbbzmlcy78wsi03wr995v932v3b6lf6xa6nq8rg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default"];
|
||||
|
@ -223,10 +223,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq";
|
||||
sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.0";
|
||||
version = "4.1.2";
|
||||
};
|
||||
ruby-rc4 = {
|
||||
groups = ["default"];
|
||||
|
@ -238,25 +238,15 @@
|
|||
};
|
||||
version = "0.1.5";
|
||||
};
|
||||
temple = {
|
||||
tilt = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4";
|
||||
sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.2";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.2";
|
||||
version = "2.2.0";
|
||||
};
|
||||
treetop = {
|
||||
dependencies = ["polyglot"];
|
||||
|
@ -264,10 +254,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh";
|
||||
sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.11";
|
||||
version = "1.6.12";
|
||||
};
|
||||
ttfunk = {
|
||||
groups = ["default"];
|
||||
|
|
57
pkgs/tools/wayland/wlay/default.nix
Normal file
57
pkgs/tools/wayland/wlay/default.nix
Normal file
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, glfw3
|
||||
, libX11
|
||||
, libXau
|
||||
, libXdmcp
|
||||
, libepoxy
|
||||
, libffi
|
||||
, libxcb
|
||||
, pkg-config
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wlay";
|
||||
version = "unstable-2022-01-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atx";
|
||||
repo = "wlay";
|
||||
rev = "ed316060ac3ac122c0d3d8918293e19dfe9a6c90";
|
||||
hash = "sha256-Lu+EyoDHiXK9QzD4jdwbllCOCl2aEU+uK6/KxC2AUGQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
extra-cmake-modules
|
||||
glfw3
|
||||
libX11
|
||||
libXau
|
||||
libXdmcp
|
||||
libepoxy
|
||||
libffi
|
||||
libxcb
|
||||
wayland
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/atx/wlay";
|
||||
description = "Graphical output management for Wayland";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
inherit (wayland.meta) platforms;
|
||||
};
|
||||
})
|
|
@ -1470,6 +1470,7 @@ mapAliases ({
|
|||
radare2-cutter = cutter; # Added 2021-03-30
|
||||
railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27
|
||||
rambox-pro = rambox; # Added 2022-12-12
|
||||
rarian = throw "rarian has been removed as unused"; # Added 2023-07-05
|
||||
raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24
|
||||
rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01
|
||||
rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22
|
||||
|
@ -1539,7 +1540,6 @@ mapAliases ({
|
|||
scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
|
||||
scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
|
||||
scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08
|
||||
rarian = throw "rarian has been removed as unused"; # Added 2023-07-05
|
||||
scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
|
||||
sdlmame = mame; # Added 2019-10-30
|
||||
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
|
||||
|
@ -1572,6 +1572,7 @@ mapAliases ({
|
|||
soldat-unstable = opensoldat; # Added 2022-07-02
|
||||
solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
soundOfSorting = sound-of-sorting; # Added 2023-07-07
|
||||
spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
|
@ -1824,7 +1825,7 @@ mapAliases ({
|
|||
|
||||
### X ###
|
||||
|
||||
x11 = throw "'x11' has been renamed to/replaced by 'xlibsWrapper'"; # Converted to throw 2022-02-22
|
||||
x11 = throw "'x11' has been renamed to/replaced by its constituents"; # Converted to throw 2022-02-22
|
||||
xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24
|
||||
xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22
|
||||
xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19
|
||||
|
|
|
@ -4522,6 +4522,8 @@ with pkgs;
|
|||
|
||||
wdt = callPackage ../applications/networking/sync/wdt { };
|
||||
|
||||
wlay = callPackage ../tools/wayland/wlay { };
|
||||
|
||||
wl-clip-persist = callPackage ../tools/wayland/wl-clip-persist { };
|
||||
|
||||
wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
|
||||
|
@ -23247,6 +23249,8 @@ with pkgs;
|
|||
|
||||
yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
|
||||
|
||||
yas = callPackage ../development/libraries/yas { };
|
||||
|
||||
libyang = callPackage ../development/libraries/libyang { };
|
||||
|
||||
libcyaml = callPackage ../development/libraries/libcyaml { };
|
||||
|
@ -40337,7 +40341,7 @@ with pkgs;
|
|||
|
||||
soundmodem = callPackage ../applications/radio/soundmodem { };
|
||||
|
||||
soundOfSorting = callPackage ../misc/sound-of-sorting { };
|
||||
sound-of-sorting = callPackage ../misc/sound-of-sorting { };
|
||||
|
||||
sourceAndTags = callPackage ../misc/source-and-tags {
|
||||
hasktags = haskellPackages.hasktags;
|
||||
|
|
|
@ -1655,6 +1655,8 @@ self: super: with self; {
|
|||
|
||||
can = callPackage ../development/python-modules/can { };
|
||||
|
||||
canals = callPackage ../development/python-modules/canals { };
|
||||
|
||||
canmatrix = callPackage ../development/python-modules/canmatrix { };
|
||||
|
||||
canonicaljson = callPackage ../development/python-modules/canonicaljson { };
|
||||
|
@ -3220,6 +3222,8 @@ self: super: with self; {
|
|||
|
||||
edward = callPackage ../development/python-modules/edward { };
|
||||
|
||||
effdet = callPackage ../development/python-modules/effdet { };
|
||||
|
||||
effect = callPackage ../development/python-modules/effect { };
|
||||
|
||||
eggdeps = callPackage ../development/python-modules/eggdeps { };
|
||||
|
@ -8101,8 +8105,6 @@ self: super: with self; {
|
|||
|
||||
poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { };
|
||||
|
||||
poetry-plugin-export = callPackage ../development/python-modules/poetry-plugin-export { };
|
||||
|
||||
poetry-semver = callPackage ../development/python-modules/poetry-semver { };
|
||||
|
||||
poezio = callPackage ../applications/networking/instant-messengers/poezio { };
|
||||
|
|
Loading…
Reference in a new issue